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

package/lib/data-source.d.ts

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

package/lib/data-source.js

@@ -33,10 +33,10 @@ __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"));
+var import_resource_manager = require("./resource-manager");
 const _DataSource = class _DataSource extends import_events.default {
   constructor(options) {
     super();
@@ -55,7 +55,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);

package/lib/index.d.ts

@@ -7,3 +7,4 @@ 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

@@ -23,6 +23,7 @@ __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"),
@@ -33,5 +34,6 @@ __reExport(src_exports, require("./data-source-with-database"), module.exports);
   ...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/utils.js

@@ -0,0 +1,46 @@
+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 utils_exports = {};
+__export(utils_exports, {
+  joinCollectionName: () => joinCollectionName,
+  parseCollectionName: () => parseCollectionName
+});
+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 = {
+  joinCollectionName,
+  parseCollectionName
+});

package/package.json

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