@nocobase/data-source-manager 0.20.0-alpha.9 → 0.21.0-alpha.2

package/lib/data-source-manager.js

@@ -40,18 +40,13 @@ const _DataSourceManager = class _DataSourceManager {
   }
   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);
     };
   }
 };

package/lib/data-source.d.ts

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

package/lib/data-source.js

@@ -33,10 +33,9 @@ __export(data_source_exports, {
 module.exports = __toCommonJS(data_source_exports);
 var import_acl = require("@nocobase/acl");
 var import_resourcer = require("@nocobase/resourcer");
+var import_events = __toESM(require("events"));
 var import_koa_compose = __toESM(require("koa-compose"));
-var import_resource_manager = require("./resource-manager");
 var import_load_default_actions = require("./load-default-actions");
-var import_events = __toESM(require("events"));
 const _DataSource = class _DataSource extends import_events.default {
   constructor(options) {
     super();
@@ -55,7 +54,7 @@ const _DataSource = class _DataSource extends import_events.default {
   init(options = {}) {
     this.acl = this.createACL();
     this.resourceManager = this.createResourceManager({
-      prefix: "/api",
+      prefix: process.env.API_BASE_PATH,
       ...options.resourceManager
     });
     this.collectionManager = this.createCollectionManager(options);
@@ -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({
@@ -104,14 +105,14 @@ 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);
+      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,9 +1,9 @@
 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';
 export * from './types';
 export * from './data-source-with-database';
+export * from './utils';

package/lib/index.js

@@ -17,21 +17,21 @@ 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);
 __reExport(src_exports, require("./types"), module.exports);
 __reExport(src_exports, require("./data-source-with-database"), module.exports);
+__reExport(src_exports, require("./utils"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (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"),
   ...require("./types"),
-  ...require("./data-source-with-database")
+  ...require("./data-source-with-database"),
+  ...require("./utils")
 });

package/lib/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function parseCollectionName(collection: string): string[];
+export declare function joinCollectionName(dataSourceName: string, collectionName: string): string;

package/lib/{resource-manager.js → utils.js}

@@ -16,17 +16,31 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var resource_manager_exports = {};
-__export(resource_manager_exports, {
-  ResourceManager: () => ResourceManager
+var utils_exports = {};
+__export(utils_exports, {
+  joinCollectionName: () => joinCollectionName,
+  parseCollectionName: () => parseCollectionName
 });
-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;
+module.exports = __toCommonJS(utils_exports);
+function parseCollectionName(collection) {
+  if (!collection) {
+    return [];
+  }
+  const dataSourceCollection = collection.split(":");
+  const collectionName = dataSourceCollection.pop();
+  const dataSourceName = dataSourceCollection[0] ?? "main";
+  return [dataSourceName, collectionName];
+}
+__name(parseCollectionName, "parseCollectionName");
+function joinCollectionName(dataSourceName, collectionName) {
+  if (!dataSourceName || dataSourceName === "main") {
+    return collectionName;
+  }
+  return `${dataSourceName}:${collectionName}`;
+}
+__name(joinCollectionName, "joinCollectionName");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ResourceManager
+  joinCollectionName,
+  parseCollectionName
 });

package/package.json

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

package/lib/resource-manager.d.ts

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