baja-lite 1.0.22 → 1.0.24

package/cjs/sql.d.ts

@@ -491,6 +491,7 @@ export interface SqliteRemoteInterface {
     initDB(dbName: string): Promise<void>;
     export(dbName: string): Promise<void>;
     restore(dbName: string, fromName: string): Promise<void>;
+    close(dbName?: string): void;
 }
 interface Connection {
     [_daoConnection]: any;
@@ -1328,6 +1329,12 @@ export declare class SqlService<T extends object> {
         sync: SyncMode.Sync;
         force?: boolean;
     }): void;
+    close(option?: MethodOption & {
+        sync?: SyncMode.Async;
+    }): Promise<void>;
+    close(option: MethodOption & {
+        sync: SyncMode.Sync;
+    }): void;
     /**
     #创建表
     ** `tableName` 表名称

package/cjs/sql.js

@@ -974,53 +974,21 @@ class SqliteRemote {
     }
     close(sync) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].close();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.close(this[_sqliteRemoteName]);
         }
         ;
     }
     backup(sync, name) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].backup(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.export(this[_sqliteRemoteName]);
         }
         ;
     }
     remove(sync) {
-        if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].remove();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
-        }
-        ;
     }
     restore(sync, name) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].restore(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.restore(this[_sqliteRemoteName], name);
         }
         ;
     }
@@ -3162,6 +3130,16 @@ class SqlService {
             });
         }
     }
+    close(option) {
+        const dbName = option?.dbName ?? this[_daoDBName] ?? exports._primaryDB;
+        delete globalThis[exports._dao][this[_dbType]][dbName];
+        if (option?.sync === SyncMode.Async) {
+            return option.dao.close(SyncMode.Async);
+        }
+        else if (option?.sync === SyncMode.Sync) {
+            option.dao.close(SyncMode.Sync);
+        }
+    }
     /**
     #创建表
     ** `tableName` 表名称
@@ -3323,6 +3301,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], SqlService.prototype, "init", null);
+__decorate([
+    P(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], SqlService.prototype, "close", null);
 /** 是否进行下一个动作 */
 const IF_PROCEED = function () {
     return function (_target, _propertyKey, descriptor) {

package/es/sql.d.ts

@@ -491,6 +491,7 @@ export interface SqliteRemoteInterface {
     initDB(dbName: string): Promise<void>;
     export(dbName: string): Promise<void>;
     restore(dbName: string, fromName: string): Promise<void>;
+    close(dbName?: string): void;
 }
 interface Connection {
     [_daoConnection]: any;
@@ -1328,6 +1329,12 @@ export declare class SqlService<T extends object> {
         sync: SyncMode.Sync;
         force?: boolean;
     }): void;
+    close(option?: MethodOption & {
+        sync?: SyncMode.Async;
+    }): Promise<void>;
+    close(option: MethodOption & {
+        sync: SyncMode.Sync;
+    }): void;
     /**
     #创建表
     ** `tableName` 表名称

package/es/sql.js

@@ -932,53 +932,21 @@ export class SqliteRemote {
     }
     close(sync) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].close();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.close(this[_sqliteRemoteName]);
         }
         ;
     }
     backup(sync, name) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].backup(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.export(this[_sqliteRemoteName]);
         }
         ;
     }
     remove(sync) {
-        if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].remove();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
-        }
-        ;
     }
     restore(sync, name) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].restore(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.restore(this[_sqliteRemoteName], name);
         }
         ;
     }
@@ -3116,6 +3084,16 @@ export class SqlService {
             });
         }
     }
+    close(option) {
+        const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
+        delete globalThis[_dao][this[_dbType]][dbName];
+        if (option?.sync === SyncMode.Async) {
+            return option.dao.close(SyncMode.Async);
+        }
+        else if (option?.sync === SyncMode.Sync) {
+            option.dao.close(SyncMode.Sync);
+        }
+    }
     /**
     #创建表
     ** `tableName` 表名称
@@ -3276,6 +3254,12 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], SqlService.prototype, "init", null);
+__decorate([
+    P(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Object)
+], SqlService.prototype, "close", null);
 /** 是否进行下一个动作 */
 const IF_PROCEED = function () {
     return function (_target, _propertyKey, descriptor) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {

package/src/sql.ts

@@ -559,6 +559,7 @@ export interface SqliteRemoteInterface {
     initDB(dbName: string): Promise<void>;
     export(dbName: string): Promise<void>;
     restore(dbName: string, fromName: string): Promise<void>;
+    close(dbName?: string): void;
 };
 interface Connection {
     [_daoConnection]: any;
@@ -1277,13 +1278,7 @@ export class SqliteRemote implements Dao {
     close(sync: SyncMode.Async): Promise<void>;
     close(sync: SyncMode): Promise<void> | void {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].close();
-                } catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.close(this[_sqliteRemoteName]);
         };
     }
 
@@ -1291,41 +1286,21 @@ export class SqliteRemote implements Dao {
     backup(sync: SyncMode.Async, name: string): Promise<void>;
     backup(sync: SyncMode, name: string): Promise<void> | void {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].backup(this[_sqliteRemoteName], name);
-                } catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.export(this[_sqliteRemoteName]);
         };
     }
 
     remove(sync: SyncMode.Sync): void;
     remove(sync: SyncMode.Async): Promise<void>;
     remove(sync: SyncMode): Promise<void> | void {
-        if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].remove();
-                } catch (error) {
-                    reject(error);
-                }
-            });
-        };
+
     }
 
     restore(sync: SyncMode.Sync, name: string): void;
     restore(sync: SyncMode.Async, name: string): Promise<void>;
     restore(sync: SyncMode, name: string): Promise<void> | void {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].restore(this[_sqliteRemoteName], name);
-                } catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.restore(this[_sqliteRemoteName], name);
         };
     }
 }
@@ -3695,6 +3670,19 @@ export class SqlService<T extends object> {
         }
     }
 
+    close(option?: MethodOption & { sync?: SyncMode.Async; }): Promise<void>;
+    close(option: MethodOption & { sync: SyncMode.Sync; }): void;
+    @P<T>()
+    close(option?: MethodOption & { sync?: SyncMode; force?: boolean }): void | Promise<void> {
+        const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
+        delete globalThis[_dao][this[_dbType]!][dbName];
+        if (option?.sync === SyncMode.Async) {
+            return option!.dao!.close(SyncMode.Async);
+        } else if (option?.sync === SyncMode.Sync) {
+            option!.dao!.close(SyncMode.Sync)
+        }
+    }
+
     /**
     #创建表
     ** `tableName` 表名称