@nocobase/data-source-manager 1.0.0-alpha.9 → 1.0.1-alpha.3

package/lib/collection-field.d.ts

@@ -11,4 +11,5 @@ export declare class CollectionField implements IField {
     options: FieldOptions;
     constructor(options: FieldOptions);
     updateOptions(options: any): void;
+    isRelationField(): boolean;
 }

package/lib/collection-field.js

@@ -41,6 +41,9 @@ const _CollectionField = class _CollectionField {
       ...options
     };
   }
+  isRelationField() {
+    return false;
+  }
 };
 __name(_CollectionField, "CollectionField");
 let CollectionField = _CollectionField;

package/lib/collection-manager.d.ts

@@ -6,8 +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 { Collection } from './collection';
-import { CollectionOptions, ICollection, ICollectionManager, IRepository, MergeOptions } from './types';
+import { CollectionOptions, ICollection, ICollectionManager, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class CollectionManager implements ICollectionManager {
     protected collections: Map<string, ICollection>;
     protected repositories: Map<string, IRepository>;
@@ -18,7 +17,11 @@ export declare class CollectionManager implements ICollectionManager {
     getRegisteredModel(key: string): any;
     getRegisteredRepository(key: any): any;
     registerFieldTypes(): void;
-    registerFieldInterfaces(): void;
+    registerFieldInterfaces(interfaces: Record<string, new (options: any) => IFieldInterface>): void;
+    registerFieldInterface(name: string, fieldInterface: new (options: any) => IFieldInterface): void;
+    getFieldInterface(name: string): {
+        new (options: any): IFieldInterface | undefined;
+    };
     registerCollectionTemplates(): void;
     registerModels(models: Record<string, any>): void;
     registerRepositories(repositories: Record<string, any>): void;
@@ -29,5 +32,5 @@ export declare class CollectionManager implements ICollectionManager {
     getCollections(): Array<ICollection>;
     getRepository(name: string, sourceId?: string | number): IRepository;
     sync(): Promise<void>;
-    protected newCollection(options: any): Collection;
+    protected newCollection(options: any): ICollection;
 }

package/lib/collection-manager.js

@@ -56,8 +56,15 @@ const _CollectionManager = class _CollectionManager {
   /* istanbul ignore next -- @preserve */
   registerFieldTypes() {
   }
-  /* istanbul ignore next -- @preserve */
-  registerFieldInterfaces() {
+  registerFieldInterfaces(interfaces) {
+    Object.keys(interfaces).forEach((key) => {
+      this.registerFieldInterface(key, interfaces[key]);
+    });
+  }
+  registerFieldInterface(name, fieldInterface) {
+  }
+  getFieldInterface(name) {
+    return;
   }
   /* istanbul ignore next -- @preserve */
   registerCollectionTemplates() {

package/lib/default-actions/list.js

@@ -41,11 +41,15 @@ function findArgs(ctx) {
   const resourceName = ctx.action.resourceName;
   const params = ctx.action.params;
   if (params.tree) {
-    const [collectionName, associationName] = resourceName.split(".");
-    const collection = ctx.db.getCollection(resourceName);
-    if (collection.options.tree && !(associationName && collectionName === collection.name)) {
-      const foreignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
-      (0, import_utils.assign)(params, { filter: { [foreignKey]: null } }, { filter: "andMerge" });
+    if ((0, import_utils.isValidFilter)(params.filter)) {
+      params.tree = false;
+    } else {
+      const [collectionName, associationName] = resourceName.split(".");
+      const collection = ctx.db.getCollection(resourceName);
+      if (collection.options.tree && !(associationName && collectionName === collection.name)) {
+        const foreignKey = ((_a = collection.treeParentField) == null ? void 0 : _a.foreignKey) || "parentId";
+        (0, import_utils.assign)(params, { filter: { [foreignKey]: null } }, { filter: "andMerge" });
+      }
     }
   }
   const { tree, fields, filter, appends, except, sort } = params;

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

@@ -6,8 +6,8 @@
  * 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 Database from '@nocobase/database';
-import { CollectionOptions, ICollection, ICollectionManager, IRepository, MergeOptions } from './types';
+import { Database } from '@nocobase/database';
+import { CollectionOptions, ICollection, ICollectionManager, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class SequelizeCollectionManager implements ICollectionManager {
     db: Database;
     options: any;
@@ -27,4 +27,8 @@ export declare class SequelizeCollectionManager implements ICollectionManager {
     getCollections(): import("@nocobase/database").Collection<any, any>[];
     getRepository<R = IRepository>(name: string, sourceId?: string | number): R;
     sync(): Promise<void>;
+    registerFieldInterface(name: string, fieldInterface: new (options: any) => IFieldInterface): void;
+    getFieldInterface(name: string): {
+        new (options: any): IFieldInterface | undefined;
+    };
 }

package/lib/sequelize-collection-manager.js

@@ -7,11 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -26,21 +24,13 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sequelize_collection_manager_exports = {};
 __export(sequelize_collection_manager_exports, {
   SequelizeCollectionManager: () => SequelizeCollectionManager
 });
 module.exports = __toCommonJS(sequelize_collection_manager_exports);
-var import_database = __toESM(require("@nocobase/database"));
+var import_database = require("@nocobase/database");
 /* istanbul ignore file -- @preserve */
 const _SequelizeCollectionManager = class _SequelizeCollectionManager {
   db;
@@ -58,10 +48,10 @@ const _SequelizeCollectionManager = class _SequelizeCollectionManager {
     };
   }
   createDB(options = {}) {
-    if (options.database instanceof import_database.default) {
+    if (options.database instanceof import_database.Database) {
       return options.database;
     }
-    return new import_database.default(options);
+    return new import_database.Database(options);
   }
   registerFieldTypes(types) {
     this.db.registerFieldTypes(types);
@@ -107,6 +97,12 @@ const _SequelizeCollectionManager = class _SequelizeCollectionManager {
   async sync() {
     await this.db.sync();
   }
+  registerFieldInterface(name, fieldInterface) {
+    this.db.interfaceManager.registerInterfaceType(name, fieldInterface);
+  }
+  getFieldInterface(name) {
+    return this.db.interfaceManager.getInterfaceType(name);
+  }
 };
 __name(_SequelizeCollectionManager, "SequelizeCollectionManager");
 let SequelizeCollectionManager = _SequelizeCollectionManager;

package/lib/types.d.ts

@@ -30,7 +30,17 @@ export type FieldOptions = {
 };
 export interface IField {
     options: FieldOptions;
+    isRelationField(): boolean;
 }
+export interface IRelationField extends IField {
+    targetCollection(): ICollection;
+}
+export interface IFieldInterface {
+    options: FieldOptions;
+    toString(value: any, ctx?: any): string;
+    toValue(str: string, ctx?: any): any;
+}
+export type FindOptions = any;
 export interface ICollection {
     repository: IRepository;
     updateOptions(options: CollectionOptions, mergeOptions?: MergeOptions): void;
@@ -45,7 +55,7 @@ export interface IModel {
     [key: string]: any;
 }
 export interface IRepository {
-    find(options?: any): Promise<IModel[]>;
+    find(options?: FindOptions): Promise<IModel[]>;
     findOne(options?: any): Promise<IModel>;
     count(options?: any): Promise<Number>;
     findAndCount(options?: any): Promise<[IModel[], Number]>;
@@ -59,7 +69,9 @@ export type MergeOptions = {
 };
 export interface ICollectionManager {
     registerFieldTypes(types: Record<string, any>): void;
-    registerFieldInterfaces(interfaces: Record<string, any>): void;
+    registerFieldInterfaces(interfaces: Record<string, new (options: any) => IFieldInterface>): void;
+    registerFieldInterface(name: string, fieldInterface: new (options: any) => IFieldInterface): void;
+    getFieldInterface(name: string): new (options: any) => IFieldInterface | undefined;
     registerCollectionTemplates(templates: Record<string, any>): void;
     registerModels(models: Record<string, any>): void;
     registerRepositories(repositories: Record<string, any>): void;

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.1-alpha.3",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.0.0-alpha.9",
-    "@nocobase/cache": "1.0.0-alpha.9",
-    "@nocobase/database": "1.0.0-alpha.9",
-    "@nocobase/resourcer": "1.0.0-alpha.9",
-    "@nocobase/utils": "1.0.0-alpha.9",
+    "@nocobase/actions": "1.0.1-alpha.3",
+    "@nocobase/cache": "1.0.1-alpha.3",
+    "@nocobase/database": "1.0.1-alpha.3",
+    "@nocobase/resourcer": "1.0.1-alpha.3",
+    "@nocobase/utils": "1.0.1-alpha.3",
     "@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": "562d6ae965317098df05db756d160e03363dcec5"
+  "gitHead": "3b2628db4eaea8973d5364e0674850591e156211"
 }