@nocobase/data-source-manager 2.0.0-alpha.5 → 2.0.0-alpha.50

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

@@ -6,8 +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 { DataSource } from './data-source';
+import { Context } from '@nocobase/actions';
+import { DataSourceOptions } from './data-source';
+import { DatabaseDataSource } from './database-data-source';
+import { DatabaseIntrospector } from './database-introspector/database-introspector';
 import { SequelizeCollectionManager } from './sequelize-collection-manager';
-export declare class SequelizeDataSource extends DataSource {
+export declare class SequelizeDataSource<T extends DatabaseIntrospector = DatabaseIntrospector> extends DatabaseDataSource<T> {
+    collectionManager: SequelizeCollectionManager;
+    constructor(options: DataSourceOptions);
     createCollectionManager(options?: any): SequelizeCollectionManager;
+    readTables(): Promise<any>;
+    loadTables(ctx: Context, tables: string[]): Promise<any>;
 }

package/lib/sequelize-data-source.js

@@ -30,12 +30,22 @@ __export(sequelize_data_source_exports, {
   SequelizeDataSource: () => SequelizeDataSource
 });
 module.exports = __toCommonJS(sequelize_data_source_exports);
-var import_data_source = require("./data-source");
+var import_database_data_source = require("./database-data-source");
 var import_sequelize_collection_manager = require("./sequelize-collection-manager");
-const _SequelizeDataSource = class _SequelizeDataSource extends import_data_source.DataSource {
+const _SequelizeDataSource = class _SequelizeDataSource extends import_database_data_source.DatabaseDataSource {
+  constructor(options) {
+    super(options);
+    this.introspector = this.createDatabaseIntrospector(this.collectionManager.db);
+  }
   createCollectionManager(options) {
     return new import_sequelize_collection_manager.SequelizeCollectionManager(options.collectionManager);
   }
+  async readTables() {
+    return;
+  }
+  async loadTables(ctx, tables) {
+    return;
+  }
 };
 __name(_SequelizeDataSource, "SequelizeDataSource");
 let SequelizeDataSource = _SequelizeDataSource;

package/lib/types.d.ts

@@ -7,13 +7,36 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { DataSource } from './data-source';
-export type CollectionOptions = {
+export type DataSourceConstructor<T extends DataSource = DataSource> = Omit<typeof DataSource, 'prototype'> & {
+    new (...args: any[]): T;
+};
+export type tableInfo = {
+    tableName: string;
+    schema?: string;
+};
+export type PartialCollectionOptions = Partial<Omit<CollectionOptions, 'fields'> & {
+    fields?: Partial<FieldOptions>[];
+}>;
+export interface CollectionOptions {
     name: string;
-    repository?: string;
+    schema?: string;
+    tableName: string;
+    title?: string;
+    template?: string;
+    timestamps?: boolean;
     filterTargetKey?: string | Array<string>;
-    fields: any[];
+    fields: FieldOptions[];
+    autoGenId?: boolean;
+    view?: boolean;
+    unsupportedFields?: UnsupportedFieldOptions[];
     [key: string]: any;
-};
+}
+export interface UnsupportedFieldOptions {
+    rawType: string;
+    name: string;
+    supported: false;
+}
+export type FieldInferResult = FieldOptions | UnsupportedFieldOptions;
 export type FieldOptions = {
     name: string;
     field: string;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.50",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "2.0.0-alpha.5",
-    "@nocobase/cache": "2.0.0-alpha.5",
-    "@nocobase/database": "2.0.0-alpha.5",
-    "@nocobase/resourcer": "2.0.0-alpha.5",
-    "@nocobase/utils": "2.0.0-alpha.5",
+    "@nocobase/actions": "2.0.0-alpha.50",
+    "@nocobase/cache": "2.0.0-alpha.50",
+    "@nocobase/database": "2.0.0-alpha.50",
+    "@nocobase/resourcer": "2.0.0-alpha.50",
+    "@nocobase/utils": "2.0.0-alpha.50",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^9.0.2"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "943e035bbec27f9ecfe8ce8857955945f20976f3"
+  "gitHead": "a6eb64abf3632e116ad0b295a7f410270a1059d1"
 }