@nocobase/data-source-manager 0.21.0-alpha.1 → 0.21.0-alpha.11

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

@@ -1,13 +1,19 @@
 import { ToposortOptions } from '@nocobase/utils';
 import { DataSource } from './data-source';
 import { DataSourceFactory } from './data-source-factory';
+type DataSourceHook = (dataSource: DataSource) => void;
 export declare class DataSourceManager {
     options: {};
     dataSources: Map<string, DataSource>;
     factory: DataSourceFactory;
+    onceHooks: Array<DataSourceHook>;
     protected middlewares: any[];
     constructor(options?: {});
+    get(dataSourceKey: string): DataSource;
     add(dataSource: DataSource, options?: any): Promise<void>;
     use(fn: any, options?: ToposortOptions): void;
     middleware(): (ctx: any, next: any) => Promise<any>;
+    afterAddDataSource(hook: DataSourceHook): void;
+    private addHookAndRun;
 }
+export {};

package/lib/data-source-manager.js

@@ -30,30 +30,41 @@ const _DataSourceManager = class _DataSourceManager {
   }
   dataSources;
   factory = new import_data_source_factory.DataSourceFactory();
+  onceHooks = [];
   middlewares = [];
+  get(dataSourceKey) {
+    return this.dataSources.get(dataSourceKey);
+  }
   async add(dataSource, options = {}) {
     await dataSource.load(options);
     this.dataSources.set(dataSource.name, dataSource);
+    for (const hook of this.onceHooks) {
+      hook(dataSource);
+    }
   }
   use(fn, options) {
     this.middlewares.push([fn, options]);
   }
   middleware() {
     return async (ctx, next) => {
-      const name = ctx.get("x-data-source");
-      if (name) {
-        if (this.dataSources.has(name)) {
-          const ds = this.dataSources.get(name);
-          ctx.dataSource = ds;
-          return ds.middleware(this.middlewares)(ctx, next);
-        } else {
-          ctx.throw(`data source ${name} does not exist`);
-        }
+      const name = ctx.get("x-data-source") || "main";
+      if (!this.dataSources.has(name)) {
+        ctx.throw(`data source ${name} does not exist`);
       }
-      await next();
-      console.log("next....");
+      const ds = this.dataSources.get(name);
+      ctx.dataSource = ds;
+      return ds.middleware(this.middlewares)(ctx, next);
     };
   }
+  afterAddDataSource(hook) {
+    this.addHookAndRun(hook);
+  }
+  addHookAndRun(hook) {
+    this.onceHooks.push(hook);
+    for (const dataSource of this.dataSources.values()) {
+      hook(dataSource);
+    }
+  }
 };
 __name(_DataSourceManager, "DataSourceManager");
 let DataSourceManager = _DataSourceManager;

package/lib/data-source.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { ACL } from '@nocobase/acl';
+import { ResourceManager } from '@nocobase/resourcer';
 import EventEmitter from 'events';
-import { ResourceManager } from './resource-manager';
 import { ICollectionManager } from './types';
 export type DataSourceOptions = any;
 export declare abstract class DataSource extends EventEmitter {

package/lib/data-source.js

@@ -36,7 +36,6 @@ 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_resource_manager = require("./resource-manager");
 const _DataSource = class _DataSource extends import_events.default {
   constructor(options) {
     super();
@@ -83,7 +82,9 @@ const _DataSource = class _DataSource extends import_events.default {
       if (this.resourceManager.isDefined(resourceName)) {
         return next();
       }
-      if (!this.collectionManager.hasCollection(resourceName)) {
+      const splitResult = resourceName.split(".");
+      const collectionName = splitResult[0];
+      if (!this.collectionManager.hasCollection(collectionName)) {
         return next();
       }
       this.resourceManager.define({
@@ -93,6 +94,7 @@ const _DataSource = class _DataSource extends import_events.default {
     };
   }
   middleware(middlewares = []) {
+    const dataSource = this;
     if (!this["_used"]) {
       for (const [fn, options] of middlewares) {
         this.resourceManager.use(fn, options);
@@ -104,14 +106,15 @@ 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.restApiMiddleware()])(ctx, next);
+      ctx.dataSource = dataSource;
+      return (0, import_koa_compose.default)([this.collectionToResourceMiddleware(), this.resourceManager.middleware()])(ctx, next);
     };
   }
   createACL() {
     return new import_acl.ACL();
   }
   createResourceManager(options) {
-    return new import_resource_manager.ResourceManager(options);
+    return new import_resourcer.ResourceManager(options);
   }
   async load(options = {}) {
   }

package/lib/default-actions/utils.js

@@ -30,10 +30,14 @@ function pageArgsToLimitArgs(page, pageSize) {
 }
 __name(pageArgsToLimitArgs, "pageArgsToLimitArgs");
 function getRepositoryFromParams(ctx) {
-  const { resourceName, resourceOf } = ctx.action;
+  const { resourceName, sourceId, actionName } = ctx.action;
   const dataSource = ctx.dataSource;
-  if (resourceOf) {
-    return dataSource.collectionManager.getRepository(resourceName, resourceOf);
+  if (sourceId === "_" && ["get", "list"].includes(actionName)) {
+    const collection = dataSource.collectionManager.getCollection(resourceName);
+    return dataSource.collectionManager.getRepository(collection.name);
+  }
+  if (sourceId) {
+    return dataSource.collectionManager.getRepository(resourceName, sourceId);
   }
   return dataSource.collectionManager.getRepository(resourceName);
 }

package/lib/index.d.ts

@@ -1,7 +1,6 @@
 export * from './collection-manager';
 export * from './data-source';
 export * from './data-source-manager';
-export * from './resource-manager';
 export * from './sequelize-collection-manager';
 export * from './sequelize-data-source';
 export * from './load-default-actions';

package/lib/index.js

@@ -17,7 +17,6 @@ module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("./collection-manager"), module.exports);
 __reExport(src_exports, require("./data-source"), module.exports);
 __reExport(src_exports, require("./data-source-manager"), module.exports);
-__reExport(src_exports, require("./resource-manager"), module.exports);
 __reExport(src_exports, require("./sequelize-collection-manager"), module.exports);
 __reExport(src_exports, require("./sequelize-data-source"), module.exports);
 __reExport(src_exports, require("./load-default-actions"), module.exports);
@@ -29,7 +28,6 @@ __reExport(src_exports, require("./utils"), module.exports);
   ...require("./collection-manager"),
   ...require("./data-source"),
   ...require("./data-source-manager"),
-  ...require("./resource-manager"),
   ...require("./sequelize-collection-manager"),
   ...require("./sequelize-data-source"),
   ...require("./load-default-actions"),

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "0.21.0-alpha.1",
+  "version": "0.21.0-alpha.11",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.21.0-alpha.1",
-    "@nocobase/cache": "0.21.0-alpha.1",
-    "@nocobase/database": "0.21.0-alpha.1",
-    "@nocobase/resourcer": "0.21.0-alpha.1",
-    "@nocobase/utils": "0.21.0-alpha.1",
+    "@nocobase/actions": "0.21.0-alpha.11",
+    "@nocobase/cache": "0.21.0-alpha.11",
+    "@nocobase/database": "0.21.0-alpha.11",
+    "@nocobase/resourcer": "0.21.0-alpha.11",
+    "@nocobase/utils": "0.21.0-alpha.11",
     "@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": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
+  "gitHead": "69fe8a6d75864a3ba98c5a6d3ebfe43a585d4cd3"
 }

package/lib/resource-manager.d.ts

@@ -1,3 +0,0 @@
-import { Resourcer } from '@nocobase/resourcer';
-export declare class ResourceManager extends Resourcer {
-}

package/lib/resource-manager.js

@@ -1,32 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var resource_manager_exports = {};
-__export(resource_manager_exports, {
-  ResourceManager: () => ResourceManager
-});
-module.exports = __toCommonJS(resource_manager_exports);
-var import_resourcer = require("@nocobase/resourcer");
-const _ResourceManager = class _ResourceManager extends import_resourcer.Resourcer {
-};
-__name(_ResourceManager, "ResourceManager");
-let ResourceManager = _ResourceManager;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ResourceManager
-});