@nocobase/data-source-manager 2.0.0-alpha.59 → 2.0.0-alpha.60

package/lib/data-source-factory.js

@@ -48,8 +48,8 @@ const _DataSourceFactory = class _DataSourceFactory {
       throw new Error(`Data source type "${type}" not found`);
     }
     const environment = (_a = this.dataSourceManager.options.app) == null ? void 0 : _a.environment;
-    const { logger, sqlLogger, ...others } = options;
-    const opts = { logger, sqlLogger, ...others };
+    const { logger, sqlLogger, databaseInstance, ...others } = options;
+    const opts = { logger, sqlLogger, databaseInstance, ...others };
     if (environment) {
       Object.assign(opts, environment.renderJsonTemplate(others));
     }

package/lib/data-source-manager.js

@@ -72,11 +72,15 @@ const _DataSourceManager = class _DataSourceManager {
     for (const hook of this.beforeAddHooks) {
       hook(dataSource);
     }
-    await dataSource.load(options);
     const oldDataSource = this.dataSources.get(dataSource.name);
     if (oldDataSource) {
-      await oldDataSource.close();
+      if (options.reuseDB === true) {
+        await oldDataSource.cleanCache();
+      } else {
+        await oldDataSource.close();
+      }
     }
+    await dataSource.load(options);
     this.dataSources.set(dataSource.name, dataSource);
     for (const hook of this.onceHooks) {
       hook(dataSource);

package/lib/data-source.d.ts

@@ -41,6 +41,7 @@ export declare abstract class DataSource extends EventEmitter {
     emitLoadingProgress(progress: LoadingProgress): void;
     load(options?: any): Promise<void>;
     close(): Promise<void>;
+    cleanCache(): Promise<void>;
     abstract createCollectionManager(options?: any): ICollectionManager;
     protected collectionToResourceMiddleware(): (ctx: any, next: any) => Promise<any>;
 }

package/lib/data-source.js

@@ -125,6 +125,8 @@ const _DataSource = class _DataSource extends import_events.default {
   }
   async close() {
   }
+  async cleanCache() {
+  }
   collectionToResourceMiddleware() {
     const self = this;
     return /* @__PURE__ */ __name(async function collectionToResource(ctx, next) {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "2.0.0-alpha.59",
+  "version": "2.0.0-alpha.60",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "2.0.0-alpha.59",
-    "@nocobase/cache": "2.0.0-alpha.59",
-    "@nocobase/database": "2.0.0-alpha.59",
-    "@nocobase/resourcer": "2.0.0-alpha.59",
-    "@nocobase/utils": "2.0.0-alpha.59",
+    "@nocobase/actions": "2.0.0-alpha.60",
+    "@nocobase/cache": "2.0.0-alpha.60",
+    "@nocobase/database": "2.0.0-alpha.60",
+    "@nocobase/resourcer": "2.0.0-alpha.60",
+    "@nocobase/utils": "2.0.0-alpha.60",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^9.0.2"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "ca9fca2a826b17735c6287bebf877b2da9a00e24"
+  "gitHead": "9113d61ce85b60b7ba3d0e5ca64182d92a15ece4"
 }