baja-lite 1.0.16 → 1.0.21

package/cjs/boot-remote.d.ts

@@ -1,2 +1,3 @@
 import { GlobalSqlOptionForWeb } from './sql';
 export declare const BootRomote: (options: GlobalSqlOptionForWeb) => Promise<void>;
+export declare const AppendRomote: (dbName: string) => Promise<void>;

package/cjs/boot-remote.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BootRomote = void 0;
+exports.AppendRomote = exports.BootRomote = void 0;
 const enum_1 = require("./enum");
 const sql_1 = require("./sql");
 const BootRomote = async function (options) {
@@ -17,7 +17,7 @@ const BootRomote = async function (options) {
     if (options.enums) {
         globalThis[sql_1._enums] = (0, enum_1.getEnums)(options.enums);
     }
-    if (options.SqliteRemote) {
+    if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = new sql_1.SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
@@ -37,3 +37,14 @@ const BootRomote = async function (options) {
     }
 };
 exports.BootRomote = BootRomote;
+const AppendRomote = async function (dbName) {
+    if (!globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][dbName]) {
+        await globalThis[sql_1._GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+        const db = new sql_1.SqliteRemote(globalThis[sql_1._GlobalSqlOption].SqliteRemote.service, dbName);
+        if (globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] === undefined) {
+            globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = db;
+        }
+        globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][dbName] = db;
+    }
+};
+exports.AppendRomote = AppendRomote;

package/cjs/boot.js

@@ -92,7 +92,7 @@ const Boot = async function (options) {
             }
         }
     }
-    if (options.SqliteRemote) {
+    if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = new sql_1.SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);

package/cjs/sql.d.ts

@@ -1,6 +1,6 @@
 import { XML } from './convert-xml';
 import { ArrayList } from './list';
-import { EnumMap } from 'enum';
+import { EnumMap } from './enum';
 import { ExtensionCodec } from "@msgpack/msgpack";
 export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;
@@ -259,7 +259,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         不支持 `SqliteMemory`
         */
-        db: Record<string, string> | string;
+        db?: Record<string, string> | string;
         /** 远程SQLITE接口实现，适用于Electron, 采用Ipc 的handel机制实现 */
         service: SqliteRemoteInterface;
     };
@@ -1684,9 +1684,15 @@ declare class StreamQuery<T extends object> {
     }): PageQuery<L> | Promise<PageQuery<L>>;
     excuteUpdate(option?: MethodOption & {
         sync?: SyncMode.Async;
+        skipUndefined?: boolean;
+        skipNull?: boolean;
+        skipEmptyString?: boolean;
     }): Promise<number>;
     excuteUpdate(option: MethodOption & {
         sync: SyncMode.Sync;
+        skipUndefined?: boolean;
+        skipNull?: boolean;
+        skipEmptyString?: boolean;
     }): number;
     excuteDelete(option?: MethodOption & {
         sync?: SyncMode.Async;

package/cjs/sql.js

@@ -1136,7 +1136,7 @@ class Build {
                     datas[i] = `${datas[i]} ${datas[i].replace(/[a-zA-Z0-9]+\./, '').replace(/_([a-z])/g, (a, b, c) => b.toUpperCase())}`;
                 }
             }
-            return datas.join(',');
+            return ` ${datas.join(',')} `;
         };
     }
     /**
@@ -1675,15 +1675,9 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
     // 只有在非插入或者非UUID时，进行空置检查
     if (option?.insert === true && uuidColumn === true) {
         ret = 1;
-        if (V === undefined) {
+        if (V === undefined || (0, string_1.emptyString)(`${V ?? ''}`)) {
             V = null;
         }
-        else if ((0, string_1.emptyString)(`${V ?? ''}`)) {
-            V = '';
-        }
-        else {
-            ret = 1;
-        }
     }
     else {
         if (V === null) {
@@ -1950,9 +1944,6 @@ const Field = (config) => {
         if (hasDef) {
             __def[propertyName] = field.def;
         }
-        if (field.comment) {
-            __def[propertyName] = field.comment;
-        }
         Reflect.defineMetadata(_fields, __fields, object);
         Reflect.defineMetadata(_columns, __columns, object);
         Reflect.defineMetadata(_columnsNoId, __columnsNoId, object);
@@ -2785,26 +2776,20 @@ class SqlService {
         const params = [];
         const sql = (0, sql_formatter_1.formatDialect)(option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
             let V = (0, lodash_get_1.default)(_params, key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const _key = (0, object_1.C2P)(key);
             V = (0, lodash_get_1.default)(_params, _key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const __key = (0, object_1.P2C)(key);
             V = (0, lodash_get_1.default)(_params, __key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             return txt;
@@ -2832,26 +2817,20 @@ class SqlService {
         const params = [];
         const sql = (0, sql_formatter_1.formatDialect)(option.sql?.replace(/\:(\w+)/g, (txt, key) => {
             let V = (0, lodash_get_1.default)(_params, key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const _key = (0, object_1.C2P)(key);
             V = (0, lodash_get_1.default)(_params, _key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const __key = (0, object_1.P2C)(key);
             V = (0, lodash_get_1.default)(_params, __key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             return txt;
@@ -3525,11 +3504,11 @@ class StreamQuery {
         return this;
     }
     groupBy(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
-    groupBy2(...keys) { this._groups.push(...keys); return this; }
+    groupBy2(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
     asc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
-    asc2(...keys) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    asc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     desc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} DESC`)); return this; }
-    desc2(...keys) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    desc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     limit(startRow, pageSize) { this._startRow = startRow; this._pageSize = pageSize; return this; }
     page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
     table(_table) { this._table = _table; return this; }
@@ -3551,9 +3530,16 @@ class StreamQuery {
     }
     select(...key) { this._columns.push(...(key.map(k => this[_fields][String(k)].C3()))); return this; }
     select2(sql, param) { this._columns.push(`${sql}`); Object.assign(this._param, param); return this; }
-    update(key, value) { this._updates ?? (this._updates = {}); this._updates[key] = value; return this; }
+    update(key, value) { this._updates ?? (this._updates = {}); this._updates[this[_fields][String(key)]?.C2()] = value; return this; }
     update2(sql, param) { this._updateColumns.push(sql); Object.assign(this._param, param); return this; }
-    updateT(t) { this._updates ?? (this._updates = {}); Object.assign(this._updates, t); return this; }
+    updateT(t) {
+        this._updates ?? (this._updates = {});
+        for (const [key, value] of Object.entries(t)) {
+            this._updates[this[_fields][String(key)]?.C2()] = value;
+        }
+        Object.assign(this._updates, t);
+        return this;
+    }
     replace(key, valueToFind, valueToReplace) {
         const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
         this._updateColumns.push(` ${this[_fields][String(key)]?.C2()} = REPLACE(${this[_fields][String(key)]?.C2()}, :${pkey1}, :${pkey2}) `);
@@ -3708,10 +3694,10 @@ class StreamQuery {
             ${where}
             `;
             if (option.sync === SyncMode.Async) {
-                return this._service.excute({ sync: SyncMode.Async, sql, params });
+                return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
             }
             else {
-                return this._service.excute({ sync: SyncMode.Sync, sql, params });
+                return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
             }
         }
         else {
@@ -3727,10 +3713,10 @@ class StreamQuery {
             ${where}
         `;
         if (option.sync === SyncMode.Async) {
-            return this._service.excute({ sync: SyncMode.Async, sql, params });
+            return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
         }
         else {
-            return this._service.excute({ sync: SyncMode.Sync, sql, params });
+            return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
         }
     }
     _where() {

package/es/boot-remote.d.ts

@@ -1,2 +1,3 @@
 import { GlobalSqlOptionForWeb } from './sql';
 export declare const BootRomote: (options: GlobalSqlOptionForWeb) => Promise<void>;
+export declare const AppendRomote: (dbName: string) => Promise<void>;

package/es/boot-remote.js

@@ -14,7 +14,7 @@ export const BootRomote = async function (options) {
     if (options.enums) {
         globalThis[_enums] = getEnums(options.enums);
     }
-    if (options.SqliteRemote) {
+    if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
@@ -33,3 +33,13 @@ export const BootRomote = async function (options) {
         }
     }
 };
+export const AppendRomote = async function (dbName) {
+    if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
+        await globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+        const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
+        if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
+            globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
+        }
+        globalThis[_dao][DBType.SqliteRemote][dbName] = db;
+    }
+};

package/es/boot.js

@@ -66,7 +66,7 @@ export const Boot = async function (options) {
             }
         }
     }
-    if (options.SqliteRemote) {
+    if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);

package/es/sql.d.ts

@@ -1,6 +1,6 @@
 import { XML } from './convert-xml';
 import { ArrayList } from './list';
-import { EnumMap } from 'enum';
+import { EnumMap } from './enum';
 import { ExtensionCodec } from "@msgpack/msgpack";
 export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;
@@ -259,7 +259,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         不支持 `SqliteMemory`
         */
-        db: Record<string, string> | string;
+        db?: Record<string, string> | string;
         /** 远程SQLITE接口实现，适用于Electron, 采用Ipc 的handel机制实现 */
         service: SqliteRemoteInterface;
     };
@@ -1684,9 +1684,15 @@ declare class StreamQuery<T extends object> {
     }): PageQuery<L> | Promise<PageQuery<L>>;
     excuteUpdate(option?: MethodOption & {
         sync?: SyncMode.Async;
+        skipUndefined?: boolean;
+        skipNull?: boolean;
+        skipEmptyString?: boolean;
     }): Promise<number>;
     excuteUpdate(option: MethodOption & {
         sync: SyncMode.Sync;
+        skipUndefined?: boolean;
+        skipNull?: boolean;
+        skipEmptyString?: boolean;
     }): number;
     excuteDelete(option?: MethodOption & {
         sync?: SyncMode.Async;

package/es/sql.js

@@ -1093,7 +1093,7 @@ class Build {
                     datas[i] = `${datas[i]} ${datas[i].replace(/[a-zA-Z0-9]+\./, '').replace(/_([a-z])/g, (a, b, c) => b.toUpperCase())}`;
                 }
             }
-            return datas.join(',');
+            return ` ${datas.join(',')} `;
         };
     }
     /**
@@ -1631,15 +1631,9 @@ const FieldFilter = (K, V, def, uuidColumn, option) => {
     // 只有在非插入或者非UUID时，进行空置检查
     if (option?.insert === true && uuidColumn === true) {
         ret = 1;
-        if (V === undefined) {
+        if (V === undefined || emptyString(`${V ?? ''}`)) {
             V = null;
         }
-        else if (emptyString(`${V ?? ''}`)) {
-            V = '';
-        }
-        else {
-            ret = 1;
-        }
     }
     else {
         if (V === null) {
@@ -1906,9 +1900,6 @@ export const Field = (config) => {
         if (hasDef) {
             __def[propertyName] = field.def;
         }
-        if (field.comment) {
-            __def[propertyName] = field.comment;
-        }
         Reflect.defineMetadata(_fields, __fields, object);
         Reflect.defineMetadata(_columns, __columns, object);
         Reflect.defineMetadata(_columnsNoId, __columnsNoId, object);
@@ -2739,26 +2730,20 @@ export class SqlService {
         const params = [];
         const sql = formatDialect(option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
             let V = LGet(_params, key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const _key = C2P(key);
             V = LGet(_params, _key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const __key = P2C(key);
             V = LGet(_params, __key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             return txt;
@@ -2786,26 +2771,20 @@ export class SqlService {
         const params = [];
         const sql = formatDialect(option.sql?.replace(/\:(\w+)/g, (txt, key) => {
             let V = LGet(_params, key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const _key = C2P(key);
             V = LGet(_params, _key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const __key = P2C(key);
             V = LGet(_params, __key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             return txt;
@@ -3478,11 +3457,11 @@ class StreamQuery {
         return this;
     }
     groupBy(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
-    groupBy2(...keys) { this._groups.push(...keys); return this; }
+    groupBy2(...keys) { this._groups.push(...keys.map(key => `${this[_fields][String(key)]?.C2()}`)); return this; }
     asc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
-    asc2(...keys) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    asc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     desc(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} DESC`)); return this; }
-    desc2(...keys) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    desc2(...keys) { this._orders.push(...keys.map(key => `${this[_fields][String(key)]?.C2()} ASC`)); return this; }
     limit(startRow, pageSize) { this._startRow = startRow; this._pageSize = pageSize; return this; }
     page(pageNumber, pageSize) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
     table(_table) { this._table = _table; return this; }
@@ -3504,9 +3483,16 @@ class StreamQuery {
     }
     select(...key) { this._columns.push(...(key.map(k => this[_fields][String(k)].C3()))); return this; }
     select2(sql, param) { this._columns.push(`${sql}`); Object.assign(this._param, param); return this; }
-    update(key, value) { this._updates ?? (this._updates = {}); this._updates[key] = value; return this; }
+    update(key, value) { this._updates ?? (this._updates = {}); this._updates[this[_fields][String(key)]?.C2()] = value; return this; }
     update2(sql, param) { this._updateColumns.push(sql); Object.assign(this._param, param); return this; }
-    updateT(t) { this._updates ?? (this._updates = {}); Object.assign(this._updates, t); return this; }
+    updateT(t) {
+        this._updates ?? (this._updates = {});
+        for (const [key, value] of Object.entries(t)) {
+            this._updates[this[_fields][String(key)]?.C2()] = value;
+        }
+        Object.assign(this._updates, t);
+        return this;
+    }
     replace(key, valueToFind, valueToReplace) {
         const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
         this._updateColumns.push(` ${this[_fields][String(key)]?.C2()} = REPLACE(${this[_fields][String(key)]?.C2()}, :${pkey1}, :${pkey2}) `);
@@ -3661,10 +3647,10 @@ class StreamQuery {
             ${where}
             `;
             if (option.sync === SyncMode.Async) {
-                return this._service.excute({ sync: SyncMode.Async, sql, params });
+                return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
             }
             else {
-                return this._service.excute({ sync: SyncMode.Sync, sql, params });
+                return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
             }
         }
         else {
@@ -3680,10 +3666,10 @@ class StreamQuery {
             ${where}
         `;
         if (option.sync === SyncMode.Async) {
-            return this._service.excute({ sync: SyncMode.Async, sql, params });
+            return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
         }
         else {
-            return this._service.excute({ sync: SyncMode.Sync, sql, params });
+            return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
         }
     }
     _where() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.0.16",
+  "version": "1.0.21",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -41,17 +41,17 @@
     "pino": "9.3.2",
     "pino-pretty": "11.2.2",
     "reflect-metadata": "0.2.2",
-    "sql-formatter": "15.3.2",
+    "sql-formatter": "15.4.0",
     "sqlstring": "2.3.3",
     "tslib": "2.6.3"
   },
   "devDependencies": {
     "@types/better-sqlite3": "7.6.11",
     "@types/mustache": "4.2.5",
-    "@types/node": "22.0.3",
+    "@types/node": "20.14.14",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.0.0",
-    "@typescript-eslint/parser": "8.0.0",
+    "@typescript-eslint/eslint-plugin": "8.2.0",
+    "@typescript-eslint/parser": "8.2.0",
     "better-sqlite3": "11.1.2",
     "ioredis": "5.4.1",
     "mongodb": "6.8.0",

package/src/boot-remote.ts

@@ -15,7 +15,7 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     if (options.enums) {
         globalThis[_enums] = getEnums(options.enums);
     }
-    if (options.SqliteRemote) {
+    if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
@@ -33,3 +33,14 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
         }
     }
 }
+
+export const AppendRomote = async function (dbName: string) {
+    if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
+        await globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+        const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
+        if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
+            globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
+        }
+        globalThis[_dao][DBType.SqliteRemote][dbName] = db;
+    }
+}

package/src/boot.ts

@@ -65,7 +65,7 @@ export const Boot = async function (options: GlobalSqlOption) {
             }
         }
     }
-    if (options.SqliteRemote) {
+    if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
@@ -130,4 +130,4 @@ export const Boot = async function (options: GlobalSqlOption) {
         });
         globalThis[_EventBus] = event;
     }
-}
+}

package/src/sql.ts

@@ -13,7 +13,7 @@ import HTML from 'html-parse-stringify';
 import { XML, convert } from './convert-xml';
 import { ArrayList } from './list';
 import LGet from 'lodash.get';
-import { EnumMap } from 'enum';
+import { EnumMap } from './enum';
 import { encode, decode, ExtensionCodec, DecodeError } from "@msgpack/msgpack";
 (BigInt.prototype as any).toJSON = function () { return this.toString() }
 
@@ -319,7 +319,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         不支持 `SqliteMemory`
         */
-        db: Record<string, string> | string,
+        db?: Record<string, string> | string,
         /** 远程SQLITE接口实现，适用于Electron, 采用Ipc 的handel机制实现 */
         service: SqliteRemoteInterface
     },
@@ -1470,7 +1470,7 @@ class Build {
                     datas[i] = `${datas[i]} ${datas[i]!.replace(/[a-zA-Z0-9]+\./, '').replace(/_([a-z])/g, (a, b, c) => b.toUpperCase())}`;
                 }
             }
-            return datas.join(',');
+            return ` ${datas.join(',')} `;
         };
     }
     /**
@@ -1998,12 +1998,8 @@ const FieldFilter = (
     // 只有在非插入或者非UUID时，进行空置检查
     if (option?.insert === true && uuidColumn === true) {
         ret = 1;
-        if (V === undefined) {
+        if (V === undefined || emptyString(`${V ?? ''}`)) {
             V = null;
-        } else if (emptyString(`${V ?? ''}`)) {
-            V = '';
-        } else {
-            ret = 1;
         }
     } else {
         if (V === null) {
@@ -2269,9 +2265,6 @@ export const Field = (config: FieldOption) => {
         if (hasDef) {
             __def[propertyName] = field.def;
         }
-        if (field.comment) {
-            __def[propertyName] = field.comment;
-        }
         Reflect.defineMetadata(_fields, __fields, object);
         Reflect.defineMetadata(_columns, __columns, object);
         Reflect.defineMetadata(_columnsNoId, __columnsNoId, object);
@@ -3268,26 +3261,20 @@ export class SqlService<T extends object> {
         const params: any[] = [];
         const sql = formatDialect(option.sql?.replace(/\:([A-Za-z0-9._]+)/g, (txt, key) => {
             let V = LGet(_params, key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const _key = C2P(key);
             V = LGet(_params, _key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const __key = P2C(key);
             V = LGet(_params, __key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             return txt;
@@ -3332,26 +3319,20 @@ export class SqlService<T extends object> {
         const params: any[] = [];
         const sql = formatDialect(option.sql?.replace(/\:(\w+)/g, (txt, key) => {
             let V = LGet(_params, key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const _key = C2P(key);
             V = LGet(_params, _key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             const __key = P2C(key);
             V = LGet(_params, __key);
-            if (V) {
-                if (V !== undefined) {
-                    params.push(V);
-                }
+            if (V !== undefined) {
+                params.push(V);
                 return '?';
             }
             return txt;
@@ -4059,15 +4040,15 @@ class StreamQuery<T extends object> {
     @IF_PROCEED<T>()
     groupBy(...keys: (keyof T)[]) { this._groups.push(...keys.map(key => `${this[_fields]![String(key)]?.C2()}`)); return this; }
     @IF_PROCEED<T>()
-    groupBy2(...keys: string[]) { this._groups.push(...keys); return this; }
+    groupBy2(...keys: string[]) { this._groups.push(...keys.map(key => `${this[_fields]![String(key)]?.C2()}`)); return this; }
     @IF_PROCEED<T>()
     asc(...keys: (keyof T)[]) { this._orders.push(...keys.map(key => `${this[_fields]![String(key)]?.C2()} ASC`)); return this; }
     @IF_PROCEED<T>()
-    asc2(...keys: string[]) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    asc2(...keys: string[]) { this._orders.push(...keys.map(key => `${this[_fields]![String(key)]?.C2()} ASC`)); return this; }
     @IF_PROCEED<T>()
     desc(...keys: (keyof T)[]) { this._orders.push(...keys.map(key => `${this[_fields]![String(key)]?.C2()} DESC`)); return this; }
     @IF_PROCEED<T>()
-    desc2(...keys: string[]) { this._orders.push(...keys.map(key => `${key} ASC`)); return this; }
+    desc2(...keys: string[]) { this._orders.push(...keys.map(key => `${this[_fields]![String(key)]?.C2()} ASC`)); return this; }
     @IF_PROCEED<T>()
     limit(startRow: number, pageSize: number) { this._startRow = startRow; this._pageSize = pageSize; return this; }
     @IF_PROCEED<T>()
@@ -4103,11 +4084,18 @@ class StreamQuery<T extends object> {
     @IF_PROCEED<T>()
     select2(sql: string, param?: Record<string, any>) { this._columns.push(`${sql}`); Object.assign(this._param, param); return this; }
     @IF_PROCEED<T>()
-    update(key: keyof T, value: T[keyof T]) { this._updates ??= {}; this._updates[key] = value; return this; }
+    update(key: keyof T, value: T[keyof T]) { this._updates ??= {}; this._updates[this[_fields]![String(key)]?.C2()!] = value; return this; }
     @IF_PROCEED<T>()
     update2(sql: string, param?: Record<string, any>) { this._updateColumns.push(sql); Object.assign(this._param, param); return this; }
     @IF_PROCEED<T>()
-    updateT(t: Partial<T>) { this._updates ??= {}; Object.assign(this._updates, t); return this; }
+    updateT(t: Partial<T>) {
+        this._updates ??= {};
+        for (const [key, value] of Object.entries(t)) {
+            this._updates[this[_fields]![String(key)]?.C2()!] = value;
+        }
+        Object.assign(this._updates, t);
+        return this;
+    }
     @IF_PROCEED<T>()
     replace(key: keyof T, valueToFind: T[keyof T], valueToReplace: T[keyof T]) {
         const [pkey1, pkey2] = [`p${this._prefix}${this._index++}`, `p${this._prefix}${this._index++}`];
@@ -4252,10 +4240,10 @@ class StreamQuery<T extends object> {
             });
         }
     }
-    excuteUpdate(option?: MethodOption & { sync?: SyncMode.Async }): Promise<number>;
-    excuteUpdate(option: MethodOption & { sync: SyncMode.Sync }): number;
+    excuteUpdate(option?: MethodOption & { sync?: SyncMode.Async; skipUndefined?: boolean; skipNull?: boolean; skipEmptyString?: boolean; }): Promise<number>;
+    excuteUpdate(option: MethodOption & { sync: SyncMode.Sync; skipUndefined?: boolean; skipNull?: boolean; skipEmptyString?: boolean; }): number;
     @IF_EXEC<T>(0)
-    excuteUpdate(option?: MethodOption & { sync?: SyncMode }): number | Promise<number> {
+    excuteUpdate(option?: MethodOption & { sync?: SyncMode; skipUndefined?: boolean; skipNull?: boolean; skipEmptyString?: boolean; }): number | Promise<number> {
         option ??= {};
         option.sync ??= SyncMode.Async;
         const { where, params } = this._where();
@@ -4273,9 +4261,9 @@ class StreamQuery<T extends object> {
             ${where}
             `;
             if (option.sync === SyncMode.Async) {
-                return this._service.excute({ sync: SyncMode.Async, sql, params });
+                return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
             } else {
-                return this._service.excute({ sync: SyncMode.Sync, sql, params });
+                return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
             }
         } else {
             return 0;
@@ -4293,9 +4281,9 @@ class StreamQuery<T extends object> {
             ${where}
         `;
         if (option.sync === SyncMode.Async) {
-            return this._service.excute({ sync: SyncMode.Async, sql, params });
+            return this._service.excute({ ...option, sync: SyncMode.Async, sql, params });
         } else {
-            return this._service.excute({ sync: SyncMode.Sync, sql, params });
+            return this._service.excute({ ...option, sync: SyncMode.Sync, sql, params });
         }
     }
     private _where() {