@nocobase/data-source-manager 1.6.0-alpha.9 → 1.6.0-beta.10

package/lib/collection-manager.d.ts

@@ -6,14 +6,15 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { CollectionOptions, ICollection, ICollectionManager, IFieldInterface, IRepository, MergeOptions } from './types';
 import { DataSource } from './data-source';
+import { CollectionOptions, ICollection, ICollectionManager, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class CollectionManager implements ICollectionManager {
     dataSource: DataSource;
     protected collections: Map<string, ICollection>;
     protected repositories: Map<string, IRepository>;
     protected models: Map<string, any>;
     constructor(options?: any);
+    setDataSource(dataSource: DataSource): void;
     getRegisteredFieldType(type: any): void;
     getRegisteredFieldInterface(key: string): void;
     getRegisteredModel(key: string): any;

package/lib/collection-manager.js

@@ -45,6 +45,9 @@ const _CollectionManager = class _CollectionManager {
       Repository: import_repository.Repository
     });
   }
+  setDataSource(dataSource) {
+    this.dataSource = dataSource;
+  }
   /* istanbul ignore next -- @preserve */
   getRegisteredFieldType(type) {
   }

package/lib/collection.d.ts

@@ -6,11 +6,11 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { CollectionOptions, ICollection, ICollectionManager, IField, IRepository } from './types';
 import { CollectionField } from './collection-field';
+import { CollectionOptions, ICollection, ICollectionManager, IField, IRepository } from './types';
 export declare class Collection implements ICollection {
     protected options: CollectionOptions;
-    protected collectionManager: ICollectionManager;
+    collectionManager: ICollectionManager;
     repository: IRepository;
     fields: Map<string, IField>;
     constructor(options: CollectionOptions, collectionManager: ICollectionManager);

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

@@ -7,8 +7,11 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { DataSource } from './data-source';
+import { DataSourceManager } from './data-source-manager';
 export declare class DataSourceFactory {
+    protected dataSourceManager: DataSourceManager;
     collectionTypes: Map<string, typeof DataSource>;
+    constructor(dataSourceManager: DataSourceManager);
     register(type: string, dataSourceClass: typeof DataSource): void;
     getClass(type: string): typeof DataSource;
     create(type: string, options?: any): DataSource;

package/lib/data-source-factory.js

@@ -31,6 +31,9 @@ __export(data_source_factory_exports, {
 });
 module.exports = __toCommonJS(data_source_factory_exports);
 const _DataSourceFactory = class _DataSourceFactory {
+  constructor(dataSourceManager) {
+    this.dataSourceManager = dataSourceManager;
+  }
   collectionTypes = /* @__PURE__ */ new Map();
   register(type, dataSourceClass) {
     this.collectionTypes.set(type, dataSourceClass);
@@ -39,11 +42,20 @@ const _DataSourceFactory = class _DataSourceFactory {
     return this.collectionTypes.get(type);
   }
   create(type, options = {}) {
+    var _a;
     const klass = this.collectionTypes.get(type);
     if (!klass) {
       throw new Error(`Data source type "${type}" not found`);
     }
-    return new klass(options);
+    const environment = (_a = this.dataSourceManager.options.app) == null ? void 0 : _a.environment;
+    const { logger, sqlLogger, ...others } = options;
+    const opts = { logger, sqlLogger, ...others };
+    if (environment) {
+      Object.assign(opts, environment.renderJsonTemplate(others));
+    }
+    const dataSource = new klass(opts);
+    dataSource.setDataSourceManager(this.dataSourceManager);
+    return dataSource;
   }
 };
 __name(_DataSourceFactory, "DataSourceFactory");

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

@@ -6,10 +6,10 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { Logger, LoggerOptions } from '@nocobase/logger';
 import { ToposortOptions } from '@nocobase/utils';
 import { DataSource } from './data-source';
 import { DataSourceFactory } from './data-source-factory';
-import { Logger, LoggerOptions } from '@nocobase/logger';
 type DataSourceHook = (dataSource: DataSource) => void;
 type DataSourceManagerOptions = {
     logger?: LoggerOptions | Logger;

package/lib/data-source-manager.js

@@ -30,12 +30,13 @@ __export(data_source_manager_exports, {
   DataSourceManager: () => DataSourceManager
 });
 module.exports = __toCommonJS(data_source_manager_exports);
-var import_data_source_factory = require("./data-source-factory");
 var import_logger = require("@nocobase/logger");
+var import_data_source_factory = require("./data-source-factory");
 const _DataSourceManager = class _DataSourceManager {
   constructor(options = {}) {
     this.options = options;
     this.dataSources = /* @__PURE__ */ new Map();
+    this.factory = new import_data_source_factory.DataSourceFactory(this);
     this.middlewares = [];
     if (options.app) {
       options.app.on("beforeStop", async () => {
@@ -49,7 +50,7 @@ const _DataSourceManager = class _DataSourceManager {
   /**
    * @internal
    */
-  factory = new import_data_source_factory.DataSourceFactory();
+  factory;
   middlewares = [];
   onceHooks = [];
   beforeAddHooks = [];

package/lib/data-source.d.ts

@@ -8,10 +8,11 @@
  */
 /// <reference types="node" />
 import { ACL } from '@nocobase/acl';
+import { Logger } from '@nocobase/logger';
 import { ResourceManager } from '@nocobase/resourcer';
 import EventEmitter from 'events';
+import { DataSourceManager } from './data-source-manager';
 import { ICollectionManager } from './types';
-import { Logger } from '@nocobase/logger';
 export type DataSourceOptions = any;
 export type LoadingProgress = {
     total: number;
@@ -22,12 +23,14 @@ export declare abstract class DataSource extends EventEmitter {
     collectionManager: ICollectionManager;
     resourceManager: ResourceManager;
     acl: ACL;
+    dataSourceManager: DataSourceManager;
     logger: Logger;
     constructor(options: DataSourceOptions);
     _sqlLogger: Logger;
     get sqlLogger(): Logger;
     get name(): any;
     static testConnection(options?: any): Promise<boolean>;
+    setDataSourceManager(dataSourceManager: DataSourceManager): void;
     setLogger(logger: Logger): void;
     setSqlLogger(logger: Logger): void;
     init(options?: DataSourceOptions): void;

package/lib/data-source.js

@@ -42,10 +42,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_utils = require("@nocobase/utils");
 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();
@@ -55,6 +55,7 @@ const _DataSource = class _DataSource extends import_events.default {
   collectionManager;
   resourceManager;
   acl;
+  dataSourceManager;
   logger;
   _sqlLogger;
   get sqlLogger() {
@@ -66,6 +67,9 @@ const _DataSource = class _DataSource extends import_events.default {
   static testConnection(options) {
     return Promise.resolve(true);
   }
+  setDataSourceManager(dataSourceManager) {
+    this.dataSourceManager = dataSourceManager;
+  }
   setLogger(logger) {
     this.logger = logger;
   }
@@ -79,6 +83,9 @@ const _DataSource = class _DataSource extends import_events.default {
       ...options.resourceManager
     });
     this.collectionManager = this.createCollectionManager(options);
+    if (this.collectionManager) {
+      this.collectionManager.setDataSource(this);
+    }
     this.resourceManager.registerActionHandlers((0, import_load_default_actions.loadDefaultActions)());
     if (options.acl !== false) {
       this.resourceManager.use(this.acl.middleware(), { tag: "acl", after: ["auth"] });

package/lib/sequelize-collection-manager.d.ts

@@ -7,11 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Database } from '@nocobase/database';
+import { DataSource } from './data-source';
 import { CollectionOptions, ICollection, ICollectionManager, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class SequelizeCollectionManager implements ICollectionManager {
     db: Database;
     options: any;
+    dataSource: DataSource;
     constructor(options: any);
+    setDataSource(dataSource: DataSource): void;
     collectionsFilter(): any;
     createDB(options?: any): any;
     registerFieldTypes(types: Record<string, any>): void;

package/lib/sequelize-collection-manager.js

@@ -35,10 +35,14 @@ var import_database = require("@nocobase/database");
 const _SequelizeCollectionManager = class _SequelizeCollectionManager {
   db;
   options;
+  dataSource;
   constructor(options) {
     this.db = this.createDB(options);
     this.options = options;
   }
+  setDataSource(dataSource) {
+    this.dataSource = dataSource;
+  }
   collectionsFilter() {
     if (this.options.collectionsFilter) {
       return this.options.collectionsFilter;

package/lib/types.d.ts

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { DataSource } from './data-source';
 export type CollectionOptions = {
     name: string;
     repository?: string;
@@ -72,6 +73,8 @@ export type MergeOptions = {
     [key: string]: any;
 };
 export interface ICollectionManager {
+    dataSource: DataSource;
+    setDataSource(dataSource: DataSource): void;
     registerFieldTypes(types: Record<string, any>): void;
     registerFieldInterfaces(interfaces: Record<string, new (options: any) => IFieldInterface>): void;
     registerFieldInterface(name: string, fieldInterface: new (options: any) => IFieldInterface): void;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.6.0-alpha.9",
+  "version": "1.6.0-beta.10",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.6.0-alpha.9",
-    "@nocobase/cache": "1.6.0-alpha.9",
-    "@nocobase/database": "1.6.0-alpha.9",
-    "@nocobase/resourcer": "1.6.0-alpha.9",
-    "@nocobase/utils": "1.6.0-alpha.9",
+    "@nocobase/actions": "1.6.0-beta.10",
+    "@nocobase/cache": "1.6.0-beta.10",
+    "@nocobase/database": "1.6.0-beta.10",
+    "@nocobase/resourcer": "1.6.0-beta.10",
+    "@nocobase/utils": "1.6.0-beta.10",
     "@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": "c6136fc6c9a2daab33fb1a20716cd9768e9a147f"
+  "gitHead": "72684ad7261e46b67969ecc4db0f1bcbea545a8d"
 }