@nocobase/data-source-manager 1.3.44-beta → 1.4.0-alpha.0

package/lib/collection.d.ts

@@ -15,7 +15,7 @@ export declare class Collection implements ICollection {
     fields: Map<string, IField>;
     constructor(options: CollectionOptions, collectionManager: ICollectionManager);
     get name(): string;
-    get filterTargetKey(): string;
+    get filterTargetKey(): string | string[];
     updateOptions(options: CollectionOptions, mergeOptions?: any): this;
     setFields(fields: any[]): void;
     setField(name: string, options: any): CollectionField;

package/lib/data-source-manager.d.ts

@@ -29,7 +29,7 @@ export declare class DataSourceManager {
     get(dataSourceKey: string): DataSource;
     add(dataSource: DataSource, options?: any): Promise<void>;
     use(fn: any, options?: ToposortOptions): void;
-    middleware(): (ctx: any, next: any) => Promise<any>;
+    middleware(): (ctx: any, next: any) => Promise<void>;
     registerDataSourceType(type: string, DataSourceClass: typeof DataSource): void;
     getDataSourceType(type: string): typeof DataSource | undefined;
     buildDataSourceByType(type: string, options?: any): DataSource;

package/lib/data-source-manager.js

@@ -85,15 +85,17 @@ const _DataSourceManager = class _DataSourceManager {
     this.middlewares.push([fn, options]);
   }
   middleware() {
-    return async (ctx, next) => {
+    const self = this;
+    return /* @__PURE__ */ __name(async function dataSourceManager(ctx, next) {
       const name = ctx.get("x-data-source") || "main";
-      if (!this.dataSources.has(name)) {
+      if (!self.dataSources.has(name)) {
         ctx.throw(`data source ${name} does not exist`);
       }
-      const ds = this.dataSources.get(name);
+      const ds = self.dataSources.get(name);
       ctx.dataSource = ds;
-      return ds.middleware(this.middlewares)(ctx, next);
-    };
+      const composedFn = ds.middleware(self.middlewares);
+      return composedFn(ctx, next);
+    }, "dataSourceManager");
   }
   registerDataSourceType(type, DataSourceClass) {
     this.factory.register(type, DataSourceClass);

package/lib/data-source.d.ts

@@ -13,24 +13,29 @@ import EventEmitter from 'events';
 import { ICollectionManager } from './types';
 import { Logger } from '@nocobase/logger';
 export type DataSourceOptions = any;
+export type LoadingProgress = {
+    total: number;
+    loaded: number;
+};
 export declare abstract class DataSource extends EventEmitter {
     protected options: DataSourceOptions;
     collectionManager: ICollectionManager;
     resourceManager: ResourceManager;
     acl: ACL;
     logger: Logger;
-    _sqlLogger: Logger;
     constructor(options: DataSourceOptions);
-    setLogger(logger: Logger): void;
-    setSqlLogger(logger: Logger): void;
+    _sqlLogger: Logger;
     get sqlLogger(): Logger;
     get name(): any;
     static testConnection(options?: any): Promise<boolean>;
+    setLogger(logger: Logger): void;
+    setSqlLogger(logger: Logger): void;
     init(options?: DataSourceOptions): void;
-    middleware(middlewares?: any): (ctx: any, next: any) => Promise<any>;
+    middleware(middlewares?: any): (ctx: any, next: any) => Promise<void>;
     createACL(): ACL;
     createResourceManager(options: any): ResourceManager;
     publicOptions(): any;
+    emitLoadingProgress(progress: LoadingProgress): void;
     load(options?: any): Promise<void>;
     close(): Promise<void>;
     abstract createCollectionManager(options?: any): ICollectionManager;

package/lib/data-source.js

@@ -45,6 +45,7 @@ var import_resourcer = require("@nocobase/resourcer");
 var import_events = __toESM(require("events"));
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_load_default_actions = require("./load-default-actions");
+var import_utils = require("@nocobase/utils");
 const _DataSource = class _DataSource extends import_events.default {
   constructor(options) {
     super();
@@ -56,12 +57,6 @@ const _DataSource = class _DataSource extends import_events.default {
   acl;
   logger;
   _sqlLogger;
-  setLogger(logger) {
-    this.logger = logger;
-  }
-  setSqlLogger(logger) {
-    this._sqlLogger = logger;
-  }
   get sqlLogger() {
     return this._sqlLogger || this.logger;
   }
@@ -71,6 +66,12 @@ const _DataSource = class _DataSource extends import_events.default {
   static testConnection(options) {
     return Promise.resolve(true);
   }
+  setLogger(logger) {
+    this.logger = logger;
+  }
+  setSqlLogger(logger) {
+    this._sqlLogger = logger;
+  }
   init(options = {}) {
     this.acl = this.createACL();
     this.resourceManager = this.createResourceManager({
@@ -97,7 +98,8 @@ const _DataSource = class _DataSource extends import_events.default {
         const { resourceName, resourceOf } = ctx.action;
         return this.collectionManager.getRepository(resourceName, resourceOf);
       };
-      return (0, import_koa_compose.default)([this.collectionToResourceMiddleware(), this.resourceManager.middleware()])(ctx, next);
+      const middlewares2 = [this.collectionToResourceMiddleware(), this.resourceManager.middleware()];
+      return (0, import_koa_compose.default)(middlewares2.map((fn) => (0, import_utils.wrapMiddlewareWithLogging)(fn)))(ctx, next);
     };
   }
   createACL() {
@@ -109,39 +111,43 @@ const _DataSource = class _DataSource extends import_events.default {
   publicOptions() {
     return null;
   }
+  emitLoadingProgress(progress) {
+    this.emit("loadingProgress", progress);
+  }
   async load(options = {}) {
   }
   async close() {
   }
   collectionToResourceMiddleware() {
-    return async (ctx, next) => {
+    const self = this;
+    return /* @__PURE__ */ __name(async function collectionToResource(ctx, next) {
       const params = (0, import_resourcer.parseRequest)(
         {
           path: ctx.request.path,
           method: ctx.request.method
         },
         {
-          prefix: this.resourceManager.options.prefix,
-          accessors: this.resourceManager.options.accessors
+          prefix: self.resourceManager.options.prefix,
+          accessors: self.resourceManager.options.accessors
         }
       );
       if (!params) {
         return next();
       }
       const resourceName = (0, import_resourcer.getNameByParams)(params);
-      if (this.resourceManager.isDefined(resourceName)) {
+      if (self.resourceManager.isDefined(resourceName)) {
         return next();
       }
       const splitResult = resourceName.split(".");
       const collectionName = splitResult[0];
-      if (!this.collectionManager.hasCollection(collectionName)) {
+      if (!self.collectionManager.hasCollection(collectionName)) {
         return next();
       }
-      this.resourceManager.define({
+      self.resourceManager.define({
         name: resourceName
       });
       return next();
-    };
+    }, "collectionToResource");
   }
 };
 __name(_DataSource, "DataSource");

package/lib/types.d.ts

@@ -9,7 +9,7 @@
 export type CollectionOptions = {
     name: string;
     repository?: string;
-    filterTargetKey?: string;
+    filterTargetKey?: string | Array<string>;
     fields: any[];
     [key: string]: any;
 };

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.3.44-beta",
+  "version": "1.4.0-alpha.0",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.3.44-beta",
-    "@nocobase/cache": "1.3.44-beta",
-    "@nocobase/database": "1.3.44-beta",
-    "@nocobase/resourcer": "1.3.44-beta",
-    "@nocobase/utils": "1.3.44-beta",
+    "@nocobase/actions": "1.4.0-alpha.0",
+    "@nocobase/cache": "1.4.0-alpha.0",
+    "@nocobase/database": "1.4.0-alpha.0",
+    "@nocobase/resourcer": "1.4.0-alpha.0",
+    "@nocobase/utils": "1.4.0-alpha.0",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "1d5666123ac1e2997e434e38defef963ba0d9f90"
+  "gitHead": "8ffa7b54bbaf720c0c9857da4b19a99110dffc4b"
 }