baja-lite 1.0.26 → 1.0.27

package/cjs/sql.d.ts

@@ -752,7 +752,7 @@ export declare function DeclareService(clz: any, config: ServiceOption): any;
  
  */
 export declare class SqlService<T extends object> {
-    private [_tableName]?;
+    [_tableName]?: string;
     private [_className]?;
     private [_ClassName]?;
     private [_vueName]?;
@@ -1266,7 +1266,7 @@ export declare class SqlService<T extends object> {
         sync: SyncMode.Sync;
         fn: (conn: Connection) => L;
     }): L | null;
-    stream<L extends object = T>(option?: MethodOption): StreamQuery<L>;
+    stream<L extends object = T>(): StreamQuery<L>;
     page<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
         sqlId: string;
@@ -1362,7 +1362,6 @@ declare class StreamQuery<T extends object> {
     private _param;
     if_proceed: boolean;
     if_exec: boolean;
-    private _table;
     private _distinct;
     private _columns;
     private _updates?;
@@ -1374,7 +1373,7 @@ declare class StreamQuery<T extends object> {
     private _service;
     private [_fields];
     private [_columns];
-    constructor(table: string, service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]);
+    constructor(service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]);
     /** 将当前stream重置 */
     reset(): this;
     /** 为下次链条执行提供条件判断：非异步方法跳过，异步方法不执行并返回默认值 */
@@ -1606,7 +1605,6 @@ declare class StreamQuery<T extends object> {
     desc2(...keys: string[]): this;
     limit(startRow: number, pageSize: number): this;
     page(pageNumber: number, pageSize: number): this;
-    table(_table: string): this;
     distinct(on?: boolean): this;
     countDistinct(key: keyof T, countName?: string): this;
     count(countName?: string): this;

package/cjs/sql.js

@@ -2870,8 +2870,8 @@ class SqlService {
             });
         }
     }
-    stream(option) {
-        return new StreamQuery(option?.tableName ?? this[_tableName], this, this[_fields], this[_columns]);
+    stream() {
+        return new StreamQuery(this, this[_fields], this[_columns]);
     }
     page(option) {
         const result = {
@@ -3358,7 +3358,7 @@ const IF_EXEC = function (def) {
     };
 };
 class StreamQuery {
-    constructor(table, service, __fields, __columns) {
+    constructor(service, __fields, __columns) {
         this._prefix = 0;
         this._index = 0;
         this._wheres = [];
@@ -3376,7 +3376,6 @@ class StreamQuery {
         this._startRow = 0;
         this._pageSize = 0;
         this._prefix = parseInt(`${Math.random() * 1000}`);
-        this._table = table;
         this._service = service;
         this[_fields] = __fields;
         this[_columns] = __columns;
@@ -3501,7 +3500,7 @@ class StreamQuery {
             this._andQuerys.push(fn);
         }
         else {
-            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const stream = new StreamQuery(this._service, this[_fields], this[_columns]);
             const ret = fn(stream);
             if (ret !== false) {
                 this._andQuerys.push(stream);
@@ -3514,7 +3513,7 @@ class StreamQuery {
             this._andQuerys.push(fn);
         }
         else {
-            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const stream = new StreamQuery(this._service, this[_fields], this[_columns]);
             const ret = fn(stream);
             if (ret !== false) {
                 this._orQuerys.push(stream);
@@ -3530,7 +3529,6 @@ class StreamQuery {
     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; }
     distinct(on = true) { this._distinct = on; return this; }
     countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT ${this[_fields][String(key)]?.C2()}) ${countName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
     count(countName) { this._columns.push(`COUNT(1) ${countName ?? 'ct'}`); return this; }
@@ -3574,7 +3572,7 @@ class StreamQuery {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3623,7 +3621,7 @@ class StreamQuery {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3637,7 +3635,7 @@ class StreamQuery {
         }
         const sqlCount = `
             SELECT COUNT(1)
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3708,7 +3706,7 @@ class StreamQuery {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} SET ${sets.join(',')}
             ${where ? ' WHERE ' : ''}
             ${where}
             `;
@@ -3727,7 +3725,7 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table}
+        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
         `;
@@ -4324,12 +4322,6 @@ __decorate([
     __metadata("design:paramtypes", [Number, Number]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "page", null);
-__decorate([
-    IF_PROCEED(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "table", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),

package/es/sql.d.ts

@@ -752,7 +752,7 @@ export declare function DeclareService(clz: any, config: ServiceOption): any;
  
  */
 export declare class SqlService<T extends object> {
-    private [_tableName]?;
+    [_tableName]?: string;
     private [_className]?;
     private [_ClassName]?;
     private [_vueName]?;
@@ -1266,7 +1266,7 @@ export declare class SqlService<T extends object> {
         sync: SyncMode.Sync;
         fn: (conn: Connection) => L;
     }): L | null;
-    stream<L extends object = T>(option?: MethodOption): StreamQuery<L>;
+    stream<L extends object = T>(): StreamQuery<L>;
     page<L = T>(option: MethodOption & {
         sync?: SyncMode.Async;
         sqlId: string;
@@ -1362,7 +1362,6 @@ declare class StreamQuery<T extends object> {
     private _param;
     if_proceed: boolean;
     if_exec: boolean;
-    private _table;
     private _distinct;
     private _columns;
     private _updates?;
@@ -1374,7 +1373,7 @@ declare class StreamQuery<T extends object> {
     private _service;
     private [_fields];
     private [_columns];
-    constructor(table: string, service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]);
+    constructor(service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]);
     /** 将当前stream重置 */
     reset(): this;
     /** 为下次链条执行提供条件判断：非异步方法跳过，异步方法不执行并返回默认值 */
@@ -1606,7 +1605,6 @@ declare class StreamQuery<T extends object> {
     desc2(...keys: string[]): this;
     limit(startRow: number, pageSize: number): this;
     page(pageNumber: number, pageSize: number): this;
-    table(_table: string): this;
     distinct(on?: boolean): this;
     countDistinct(key: keyof T, countName?: string): this;
     count(countName?: string): this;

package/es/sql.js

@@ -2824,8 +2824,8 @@ export class SqlService {
             });
         }
     }
-    stream(option) {
-        return new StreamQuery(option?.tableName ?? this[_tableName], this, this[_fields], this[_columns]);
+    stream() {
+        return new StreamQuery(this, this[_fields], this[_columns]);
     }
     page(option) {
         const result = {
@@ -3311,7 +3311,7 @@ const IF_EXEC = function (def) {
     };
 };
 class StreamQuery {
-    constructor(table, service, __fields, __columns) {
+    constructor(service, __fields, __columns) {
         this._prefix = 0;
         this._index = 0;
         this._wheres = [];
@@ -3329,7 +3329,6 @@ class StreamQuery {
         this._startRow = 0;
         this._pageSize = 0;
         this._prefix = parseInt(`${Math.random() * 1000}`);
-        this._table = table;
         this._service = service;
         this[_fields] = __fields;
         this[_columns] = __columns;
@@ -3454,7 +3453,7 @@ class StreamQuery {
             this._andQuerys.push(fn);
         }
         else {
-            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const stream = new StreamQuery(this._service, this[_fields], this[_columns]);
             const ret = fn(stream);
             if (ret !== false) {
                 this._andQuerys.push(stream);
@@ -3467,7 +3466,7 @@ class StreamQuery {
             this._andQuerys.push(fn);
         }
         else {
-            const stream = new StreamQuery(this._table, this._service, this[_fields], this[_columns]);
+            const stream = new StreamQuery(this._service, this[_fields], this[_columns]);
             const ret = fn(stream);
             if (ret !== false) {
                 this._orQuerys.push(stream);
@@ -3483,7 +3482,6 @@ class StreamQuery {
     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; }
     distinct(on = true) { this._distinct = on; return this; }
     countDistinct(key, countName) { this._columns.push(`COUNT(DISTINCT ${this[_fields][String(key)]?.C2()}) ${countName || `${this[_fields][String(key)]?.C2()}`}`); return this; }
     count(countName) { this._columns.push(`COUNT(1) ${countName ?? 'ct'}`); return this; }
@@ -3527,7 +3525,7 @@ class StreamQuery {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3576,7 +3574,7 @@ class StreamQuery {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields][String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3590,7 +3588,7 @@ class StreamQuery {
         }
         const sqlCount = `
             SELECT COUNT(1)
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -3661,7 +3659,7 @@ class StreamQuery {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} SET ${sets.join(',')}
             ${where ? ' WHERE ' : ''}
             ${where}
             `;
@@ -3680,7 +3678,7 @@ class StreamQuery {
         option ?? (option = {});
         option.sync ?? (option.sync = SyncMode.Async);
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table}
+        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
         `;
@@ -4277,12 +4275,6 @@ __decorate([
     __metadata("design:paramtypes", [Number, Number]),
     __metadata("design:returntype", void 0)
 ], StreamQuery.prototype, "page", null);
-__decorate([
-    IF_PROCEED(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", void 0)
-], StreamQuery.prototype, "table", null);
 __decorate([
     IF_PROCEED(),
     __metadata("design:type", Function),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {
@@ -50,8 +50,8 @@
     "@types/mustache": "4.2.5",
     "@types/node": "20.14.14",
     "@types/sqlstring": "2.3.2",
-    "@typescript-eslint/eslint-plugin": "8.2.0",
-    "@typescript-eslint/parser": "8.2.0",
+    "@typescript-eslint/eslint-plugin": "8.3.0",
+    "@typescript-eslint/parser": "8.3.0",
     "better-sqlite3": "11.2.1",
     "ioredis": "5.4.1",
     "mongodb": "6.8.0",

package/src/sql.ts

@@ -2397,7 +2397,7 @@ export function DeclareService(clz: any, config: ServiceOption) {
  
  */
 export class SqlService<T extends object> {
-    private [_tableName]?: string;
+    [_tableName]?: string;
     private [_className]?: string;
     private [_ClassName]?: string;
     private [_vueName]?: string;
@@ -3405,8 +3405,8 @@ export class SqlService<T extends object> {
         }
     }
 
-    stream<L extends object = T>(option?: MethodOption) {
-        return new StreamQuery<L>(option?.tableName ?? this[_tableName]!, this as any, this[_fields]!, this[_columns]!);
+    stream<L extends object = T>() {
+        return new StreamQuery<L>(this as any, this[_fields]!, this[_columns]!);
     }
 
     page<L = T>(option: MethodOption & { sync?: SyncMode.Async; sqlId: string; context?: any; params: Record<string, any>; pageSize?: number; pageNumber?: number; limitSelf?: boolean; countSelf?: boolean; sumSelf?: boolean; orderBy?: string; hump?: boolean; mapper?: string | SqlMapper; mapperIfUndefined?: MapperIfUndefined; }): Promise<PageQuery<L>>;
@@ -3855,7 +3855,6 @@ class StreamQuery<T extends object> {
     private _param: Record<string, any> = {};
     public if_proceed = true;
     public if_exec = true;
-    private _table: string;
 
     private _distinct = false;
     private _columns: string[] = [];
@@ -3872,9 +3871,8 @@ class StreamQuery<T extends object> {
     private _service: SqlService<T>;
     private [_fields]: Record<string, AField>;
     private [_columns]: string[];
-    constructor(table: string, service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]) {
+    constructor(service: SqlService<T>, __fields: Record<string, AField>, __columns: string[]) {
         this._prefix = parseInt(`${Math.random() * 1000}`);
-        this._table = table;
         this._service = service;
         this[_fields] = __fields;
         this[_columns] = __columns;
@@ -4050,7 +4048,7 @@ class StreamQuery<T extends object> {
         if (fn instanceof StreamQuery) {
             this._andQuerys.push(fn);
         } else {
-            const stream = new StreamQuery<T>(this._table, this._service, this[_fields], this[_columns]);
+            const stream = new StreamQuery<T>(this._service, this[_fields], this[_columns]);
             const ret = fn(stream);
             if (ret !== false) { this._andQuerys.push(stream); }
         }
@@ -4061,7 +4059,7 @@ class StreamQuery<T extends object> {
         if (fn instanceof StreamQuery) {
             this._andQuerys.push(fn);
         } else {
-            const stream = new StreamQuery<T>(this._table, this._service, this[_fields], this[_columns]!);
+            const stream = new StreamQuery<T>(this._service, this[_fields], this[_columns]!);
             const ret = fn(stream);
             if (ret !== false) { this._orQuerys.push(stream); }
         }
@@ -4085,8 +4083,6 @@ class StreamQuery<T extends object> {
     @IF_PROCEED<T>()
     page(pageNumber: number, pageSize: number) { this._startRow = ((pageNumber || 1) - 1) * pageSize; this._pageSize = pageSize; return this; }
     @IF_PROCEED<T>()
-    table(_table: string) { this._table = _table; return this; }
-    @IF_PROCEED<T>()
     distinct(on = true) { this._distinct = on; return this; }
     @IF_PROCEED<T>()
     countDistinct(key: keyof T, countName?: string,) { this._columns.push(`COUNT(DISTINCT ${this[_fields]![String(key)]?.C2()}) ${countName || `${this[_fields]![String(key)]?.C2()}`}`); return this; }
@@ -4154,7 +4150,7 @@ class StreamQuery<T extends object> {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields]![String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -4202,7 +4198,7 @@ class StreamQuery<T extends object> {
         let sql = `
             SELECT
             ${this._distinct ? 'DISTINCT' : ''} ${this._columns && this._columns.length > 0 ? this._columns.join(',') : this[_columns].map(key => this[_fields]![String(key)]?.C3()).join(',')}
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -4215,7 +4211,7 @@ class StreamQuery<T extends object> {
         }
         const sqlCount = `
             SELECT COUNT(1)
-            FROM ${this._table}
+            FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
             ${this._groups.length > 0 ? `GROUP BY ${this._groups.join(',')} ` : ''}
@@ -4287,7 +4283,7 @@ class StreamQuery<T extends object> {
             }
         }
         if (sets.length > 0) {
-            const sql = `UPDATE ${this._table} SET ${sets.join(',')}
+            const sql = `UPDATE ${option.tableName ?? this._service[_tableName]} SET ${sets.join(',')}
             ${where ? ' WHERE ' : ''}
             ${where}
             `;
@@ -4307,7 +4303,7 @@ class StreamQuery<T extends object> {
         option ??= {};
         option.sync ??= SyncMode.Async;
         const { where, params } = this._where();
-        const sql = `DELETE FROM ${this._table}
+        const sql = `DELETE FROM ${option.tableName ?? this._service[_tableName]}
             ${where ? ' WHERE ' : ''}
             ${where}
         `;