npm - baja-lite - Versions diffs - 1.0.10 → 1.0.20 - Mend

baja-lite 1.0.10 → 1.0.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/cjs/boot-remote.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,8 @@
 import { XML } from './convert-xml';
 import { ArrayList } from './list';
 import { EnumMap } from 'enum';
+import { ExtensionCodec } from "@msgpack/msgpack";
+export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;
 declare const _tableName: unique symbol;
 declare const _className: unique symbol;
@@ -257,7 +259,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         不支持 `SqliteMemory`
         */
-        db: Record<string, string> | string;
+        db?: Record<string, string> | string;
         /** 远程SQLITE接口实现，适用于Electron, 采用Ipc 的handel机制实现 */
         service: SqliteRemoteInterface;
     };
@@ -1682,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 CHANGED Viewed

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _b, _c, _d;
 var _e, _f, _g, _h;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqlService = exports.DB = exports.Field = exports.SqlCache = exports.SqliteRemote = exports.SqliteRemoteConnection = exports.Sqlite = exports.Mysql = exports._defOption = exports.SqliteMemory = exports.ColumnMode = exports.SqlType = exports.SelectResult = exports.TemplateResult = exports.SelectMode = exports.DeleteMode = exports.InsertMode = exports.SyncMode = exports.MapperIfUndefined = exports.DBType = exports.logger = exports._fs = exports._path = exports._EventBus = exports._GlobalSqlOption = exports._Hump = exports._enums = exports._primaryDB = exports._dao = exports._sqlCache = void 0;
+exports.SqlService = exports.DB = exports.Field = exports.SqlCache = exports.SqliteRemote = exports.SqliteRemoteConnection = exports.Sqlite = exports.Mysql = exports._defOption = exports.SqliteMemory = exports.ColumnMode = exports.SqlType = exports.SelectResult = exports.TemplateResult = exports.SelectMode = exports.DeleteMode = exports.InsertMode = exports.SyncMode = exports.MapperIfUndefined = exports.DBType = exports.logger = exports._fs = exports._path = exports._EventBus = exports._GlobalSqlOption = exports._Hump = exports._enums = exports._primaryDB = exports._dao = exports._sqlCache = exports.extensionCodec = void 0;
 exports.flatData = flatData;
 exports.DeclareClass = DeclareClass;
 exports.DeclareService = DeclareService;
@@ -65,6 +65,31 @@ const list_1 = require("./list");
 const lodash_get_1 = __importDefault(require("lodash.get"));
 const msgpack_1 = require("@msgpack/msgpack");
 BigInt.prototype.toJSON = function () { return this.toString(); };
+const BIGINT_EXT_TYPE = 0;
+exports.extensionCodec = new msgpack_1.ExtensionCodec();
+exports.extensionCodec.register({
+    type: BIGINT_EXT_TYPE,
+    encode(input) {
+        if (typeof input === "bigint") {
+            if (input <= Number.MAX_SAFE_INTEGER && input >= Number.MIN_SAFE_INTEGER) {
+                return (0, msgpack_1.encode)(Number(input));
+            }
+            else {
+                return (0, msgpack_1.encode)(String(input));
+            }
+        }
+        else {
+            return null;
+        }
+    },
+    decode(data) {
+        const val = (0, msgpack_1.decode)(data);
+        if (!(typeof val === "string" || typeof val === "number")) {
+            throw new msgpack_1.DecodeError(`unexpected BigInt source: ${val} (${typeof val})`);
+        }
+        return BigInt(val);
+    },
+});
 // #region 常量
 const _daoDBName = Symbol('dbName');
 const _tableName = Symbol('tableName');
@@ -781,8 +806,8 @@ class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].execute((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params]));
-                const { affectedRows, insertId } = (0, msgpack_1.decode)(data);
+                const data = await this[_daoConnection].execute((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params], { extensionCodec: exports.extensionCodec }));
+                const { affectedRows, insertId } = (0, msgpack_1.decode)(data, { extensionCodec: exports.extensionCodec });
                 resolve({ affectedRows, insertId: insertId ? BigInt(insertId) : 0n });
             }
             catch (error) {
@@ -811,8 +836,8 @@ class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params]));
-                const r = (0, msgpack_1.decode)(data);
+                const data = await this[_daoConnection].pluck((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params], { extensionCodec: exports.extensionCodec }));
+                const r = (0, msgpack_1.decode)(data, { extensionCodec: exports.extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -841,8 +866,8 @@ class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params]));
-                const r = (0, msgpack_1.decode)(data);
+                const data = await this[_daoConnection].get((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params], { extensionCodec: exports.extensionCodec }));
+                const r = (0, msgpack_1.decode)(data, { extensionCodec: exports.extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -871,8 +896,8 @@ class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params]));
-                const r = (0, msgpack_1.decode)(data);
+                const data = await this[_daoConnection].raw((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params], { extensionCodec: exports.extensionCodec }));
+                const r = (0, msgpack_1.decode)(data, { extensionCodec: exports.extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -901,8 +926,8 @@ class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params]));
-                const r = (0, msgpack_1.decode)(data);
+                const data = await this[_daoConnection].query((0, msgpack_1.encode)([this[_sqliteRemoteName], sql, params], { extensionCodec: exports.extensionCodec }));
+                const r = (0, msgpack_1.decode)(data, { extensionCodec: exports.extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -1111,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(',')} `;
         };
     }
     /**
@@ -1925,9 +1950,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);
@@ -2577,8 +2599,7 @@ class SqlService {
                 return result[0];
             }
             case TemplateResult.NotSureOne: {
-                error_1.Throw.if(!result, error);
-                return result[0] ?? null;
+                return result && result.length > 0 ? result[0] ?? null : null;
             }
             case TemplateResult.Many: {
                 return result;
@@ -2761,26 +2782,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;
@@ -2808,26 +2823,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;
@@ -3501,11 +3510,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; }
@@ -3527,9 +3536,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}) `);
@@ -3679,12 +3695,15 @@ class StreamQuery {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')} ${where}`;
+            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            ${where ? ' WHERE ' : ''}
+            ${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 {
@@ -3695,12 +3714,15 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table} ${where}`;
+        const sql = `DELETE FROM ${this._table}
+            ${where ? ' WHERE ' : ''}
+            ${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/cjs/sqlite.js CHANGED Viewed

@@ -39,7 +39,7 @@ class SqliteRemoteClass {
         sql_1.logger.debug(sql, params ?? '');
         try {
             if (!sql) {
-                return (0, msgpack_1.encode)({ affectedRows: 0, insertId: 0n });
+                return (0, msgpack_1.encode)({ affectedRows: 0, insertId: 0n }, { extensionCodec: sql_1.extensionCodec });
             }
             ;
             if (this.trace) {
@@ -50,7 +50,7 @@ class SqliteRemoteClass {
                 sql_1.logger.trace(result);
             }
             const { changes, lastInsertRowid } = result;
-            return (0, msgpack_1.encode)({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n });
+            return (0, msgpack_1.encode)({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec: sql_1.extensionCodec });
         }
         catch (error) {
             sql_1.logger.error(`
@@ -73,7 +73,7 @@ class SqliteRemoteClass {
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}));
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec: sql_1.extensionCodec });
         }
         catch (error) {
             sql_1.logger.error(`
@@ -91,7 +91,7 @@ class SqliteRemoteClass {
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).get(params ?? {}));
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec: sql_1.extensionCodec });
         }
         catch (error) {
             sql_1.logger.error(`
@@ -113,7 +113,7 @@ class SqliteRemoteClass {
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).raw().all(params ?? {}));
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec: sql_1.extensionCodec });
         }
         catch (error) {
             sql_1.logger.error(`
@@ -135,7 +135,7 @@ class SqliteRemoteClass {
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).all(params ?? {}));
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec: sql_1.extensionCodec });
         }
         catch (error) {
             sql_1.logger.error(`

package/es/boot-remote.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,6 +1,8 @@
 import { XML } from './convert-xml';
 import { ArrayList } from './list';
 import { EnumMap } from 'enum';
+import { ExtensionCodec } from "@msgpack/msgpack";
+export declare const extensionCodec: ExtensionCodec<undefined>;
 declare const _daoDBName: unique symbol;
 declare const _tableName: unique symbol;
 declare const _className: unique symbol;
@@ -257,7 +259,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         不支持 `SqliteMemory`
         */
-        db: Record<string, string> | string;
+        db?: Record<string, string> | string;
         /** 远程SQLITE接口实现，适用于Electron, 采用Ipc 的handel机制实现 */
         service: SqliteRemoteInterface;
     };
@@ -1682,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 CHANGED Viewed

@@ -24,8 +24,33 @@ import HTML from 'html-parse-stringify';
 import { convert } from './convert-xml';
 import { ArrayList } from './list';
 import LGet from 'lodash.get';
-import { encode, decode } from "@msgpack/msgpack";
+import { encode, decode, ExtensionCodec, DecodeError } from "@msgpack/msgpack";
 BigInt.prototype.toJSON = function () { return this.toString(); };
+const BIGINT_EXT_TYPE = 0;
+export const extensionCodec = new ExtensionCodec();
+extensionCodec.register({
+    type: BIGINT_EXT_TYPE,
+    encode(input) {
+        if (typeof input === "bigint") {
+            if (input <= Number.MAX_SAFE_INTEGER && input >= Number.MIN_SAFE_INTEGER) {
+                return encode(Number(input));
+            }
+            else {
+                return encode(String(input));
+            }
+        }
+        else {
+            return null;
+        }
+    },
+    decode(data) {
+        const val = decode(data);
+        if (!(typeof val === "string" || typeof val === "number")) {
+            throw new DecodeError(`unexpected BigInt source: ${val} (${typeof val})`);
+        }
+        return BigInt(val);
+    },
+});
 // #region 常量
 const _daoDBName = Symbol('dbName');
 const _tableName = Symbol('tableName');
@@ -740,8 +765,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].execute(encode([this[_sqliteRemoteName], sql, params]));
-                const { affectedRows, insertId } = decode(data);
+                const data = await this[_daoConnection].execute(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const { affectedRows, insertId } = decode(data, { extensionCodec });
                 resolve({ affectedRows, insertId: insertId ? BigInt(insertId) : 0n });
             }
             catch (error) {
@@ -770,8 +795,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data);
+                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -800,8 +825,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data);
+                const data = await this[_daoConnection].get(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -830,8 +855,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data);
+                const data = await this[_daoConnection].raw(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -860,8 +885,8 @@ export class SqliteRemoteConnection {
         }
         return new Promise(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data);
+                const data = await this[_daoConnection].query(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec });
                 resolve(r);
             }
             catch (error) {
@@ -1068,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(',')} `;
         };
     }
     /**
@@ -1881,9 +1906,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);
@@ -2531,8 +2553,7 @@ export class SqlService {
                 return result[0];
             }
             case TemplateResult.NotSureOne: {
-                Throw.if(!result, error);
-                return result[0] ?? null;
+                return result && result.length > 0 ? result[0] ?? null : null;
             }
             case TemplateResult.Many: {
                 return result;
@@ -2715,26 +2736,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;
@@ -2762,26 +2777,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;
@@ -3454,11 +3463,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; }
@@ -3480,9 +3489,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}) `);
@@ -3632,12 +3648,15 @@ class StreamQuery {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')} ${where}`;
+            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            ${where ? ' WHERE ' : ''}
+            ${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 {
@@ -3648,12 +3667,15 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table} ${where}`;
+        const sql = `DELETE FROM ${this._table}
+            ${where ? ' WHERE ' : ''}
+            ${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/sqlite.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { logger } from './sql';
+import { extensionCodec, logger } from './sql';
 import Sqlstring from 'sqlstring';
 import { encode, decode } from "@msgpack/msgpack";
 export class SqliteRemoteClass {
@@ -10,7 +10,7 @@ export class SqliteRemoteClass {
         logger.debug(sql, params ?? '');
         try {
             if (!sql) {
-                return encode({ affectedRows: 0, insertId: 0n });
+                return encode({ affectedRows: 0, insertId: 0n }, { extensionCodec });
             }
             ;
             if (this.trace) {
@@ -21,7 +21,7 @@ export class SqliteRemoteClass {
                 logger.trace(result);
             }
             const { changes, lastInsertRowid } = result;
-            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n });
+            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -44,7 +44,7 @@ export class SqliteRemoteClass {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -62,7 +62,7 @@ export class SqliteRemoteClass {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -84,7 +84,7 @@ export class SqliteRemoteClass {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`
@@ -106,7 +106,7 @@ export class SqliteRemoteClass {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec });
         }
         catch (error) {
             logger.error(`

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.0.10",
+  "version": "1.0.20",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -30,35 +30,35 @@
     "sqlite": "node inspect ./dist/cjs/test-sqlite.js"
   },
   "dependencies": {
-    "@msgpack/msgpack": "^3.0.0-beta2",
-    "@types/lodash.get": "^4.4.9",
-    "@types/shelljs": "^0.8.15",
+    "@msgpack/msgpack": "3.0.0-beta2",
+    "@types/lodash.get": "4.4.9",
+    "@types/shelljs": "0.8.15",
     "decimal.js": "10.4.3",
     "html-parse-stringify": "3.0.1",
     "iterare": "1.2.1",
-    "lodash.get": "^4.4.2",
+    "lodash.get": "4.4.2",
     "mustache": "4.2.0",
-    "pino": "9.2.0",
-    "pino-pretty": "11.2.1",
+    "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": "20.14.10",
+    "@types/node": "20.14.14",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "7.15.0",
-    "@typescript-eslint/parser": "7.15.0",
-    "better-sqlite3": "11.0.0",
+    "@typescript-eslint/eslint-plugin": "8.1.0",
+    "@typescript-eslint/parser": "8.1.0",
+    "better-sqlite3": "11.1.2",
     "ioredis": "5.4.1",
     "mongodb": "6.8.0",
-    "mysql2": "3.10.2",
+    "mysql2": "3.11.0",
     "redlock": "5.0.0-beta.2",
     "shelljs": "0.8.5",
-    "typescript": "5.5.3"
+    "typescript": "5.5.4"
   },
   "engines": {
     "node": ">=20"

package/src/boot-remote.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -14,8 +14,34 @@ import { XML, convert } from './convert-xml';
 import { ArrayList } from './list';
 import LGet from 'lodash.get';
 import { EnumMap } from 'enum';
-import { encode, decode } from "@msgpack/msgpack";
+import { encode, decode, ExtensionCodec, DecodeError } from "@msgpack/msgpack";
 (BigInt.prototype as any).toJSON = function () { return this.toString() }
+const BIGINT_EXT_TYPE = 0;
+export const extensionCodec = new ExtensionCodec();
+extensionCodec.register({
+    type: BIGINT_EXT_TYPE,
+    encode(input: unknown): Uint8Array | null {
+        if (typeof input === "bigint") {
+            if (input <= Number.MAX_SAFE_INTEGER && input >= Number.MIN_SAFE_INTEGER) {
+                return encode(Number(input));
+            } else {
+                return encode(String(input));
+            }
+        } else {
+            return null;
+        }
+    },
+    decode(data: Uint8Array): bigint {
+        const val = decode(data);
+        if (!(typeof val === "string" || typeof val === "number")) {
+            throw new DecodeError(`unexpected BigInt source: ${val} (${typeof val})`);
+        }
+        return BigInt(val);
+    },
+});
 // #region 常量
 const _daoDBName = Symbol('dbName');
 const _tableName = Symbol('tableName');
@@ -293,7 +319,7 @@ export interface GlobalSqlOptionForWeb {
         ```
         不支持 `SqliteMemory`
         */
-        db: Record<string, string> | string,
+        db?: Record<string, string> | string,
         /** 远程SQLITE接口实现，适用于Electron, 采用Ipc 的handel机制实现 */
         service: SqliteRemoteInterface
     },
@@ -1078,8 +1104,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<{ affectedRows: number; insertId: bigint; }>(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].execute(encode([this[_sqliteRemoteName], sql, params]));
-                const { affectedRows, insertId } = decode(data) as { affectedRows: number; insertId: bigint; };
+                const data = await this[_daoConnection].execute(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const { affectedRows, insertId } = decode(data, { extensionCodec }) as { affectedRows: number; insertId: bigint; };
                 resolve({ affectedRows, insertId: insertId ? BigInt(insertId) : 0n });
             } catch (error) {
                 logger.error(`
@@ -1106,8 +1132,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data) as T;
+                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T;
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1134,8 +1160,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T | null>(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data) as T;
+                const data = await this[_daoConnection].get(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T;
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1162,8 +1188,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data) as T[];
+                const data = await this[_daoConnection].raw(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T[];
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1190,8 +1216,8 @@ export class SqliteRemoteConnection implements Connection {
         }
         return new Promise<T[]>(async (resolve, reject) => {
             try {
-                const data = await this[_daoConnection].pluck(encode([this[_sqliteRemoteName], sql, params]));
-                const r = decode(data) as T[];
+                const data = await this[_daoConnection].query(encode([this[_sqliteRemoteName], sql, params], { extensionCodec }));
+                const r = decode(data, { extensionCodec }) as T[];
                 resolve(r);
             } catch (error) {
                 logger.error(`
@@ -1444,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(',')} `;
         };
     }
     /**
@@ -2243,9 +2269,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);
@@ -3000,8 +3023,7 @@ export class SqlService<T extends object> {
                 return result[0] as T;
             }
             case TemplateResult.NotSureOne: {
-                Throw.if(!result, error);
-                return (result[0] as T) ?? null;
+                return result && result.length > 0 ? (result[0] as T) ?? null : null;
             }
             case TemplateResult.Many: {
                 return result;
@@ -3243,26 +3265,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;
@@ -3307,26 +3323,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;
@@ -4034,15 +4044,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>()
@@ -4078,11 +4088,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++}`];
@@ -4227,10 +4244,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();
@@ -4243,11 +4260,14 @@ class StreamQuery<T extends object> {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')} ${where}`;
+            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            ${where ? ' WHERE ' : ''}
+            ${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;
@@ -4260,11 +4280,14 @@ class StreamQuery<T extends object> {
         option ??= {};
         option.sync ??= SyncMode.Async;
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table} ${where}`;
+        const sql = `DELETE FROM ${this._table}
+            ${where ? ' WHERE ' : ''}
+            ${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() {

package/src/sqlite.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { SqliteRemoteInterface, logger } from './sql';
+import { SqliteRemoteInterface, extensionCodec, logger } from './sql';
 import Sqlstring from 'sqlstring';
 import { encode, decode } from "@msgpack/msgpack";
 export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
@@ -27,7 +27,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
         const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
-            if (!sql) { return encode({ affectedRows: 0, insertId: 0n }); };
+            if (!sql) { return encode({ affectedRows: 0, insertId: 0n }, { extensionCodec }); };
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
@@ -36,7 +36,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
                 logger.trace(result);
             }
             const { changes, lastInsertRowid } = result;
-            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n });
+            return encode({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n }, { extensionCodec });
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -55,7 +55,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}), { extensionCodec });
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -72,7 +72,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).get(params ?? {}), { extensionCodec });
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -90,7 +90,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).raw().all(params ?? {}), { extensionCodec });
         } catch (error) {
             logger.error(`
                 error: ${error},
@@ -108,7 +108,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             if (this.trace) {
                 logger.trace(Sqlstring.format(sql!, params));
             }
-            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}));
+            return encode(this.dbList[dbName].prepare(sql).all(params ?? {}), { extensionCodec });
         } catch (error) {
             logger.error(`
                 error: ${error},