@nocobase/database 0.9.2-alpha.4 → 0.9.4-alpha.1

package/lib/collection.d.ts

@@ -56,27 +56,19 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     fields: Map<string, any>;
     model: ModelStatic<Model>;
     repository: Repository<TModelAttributes, TCreationAttributes>;
+    constructor(options: CollectionOptions, context: CollectionContext);
     get filterTargetKey(): string;
     get name(): string;
     get titleField(): string;
     get db(): Database;
     get treeParentField(): BelongsToField | null;
     get treeChildrenField(): HasManyField | null;
-    constructor(options: CollectionOptions, context: CollectionContext);
-    private checkOptions;
-    private checkTableName;
     tableName(): any;
-    protected sequelizeModelOptions(): {
-        modelName: string;
-        sequelize: import("sequelize").Sequelize;
-        tableName: any;
-    };
     /**
      * TODO
      */
     modelInit(): void;
     setRepository(repository?: RepositoryType | string): void;
-    private bindFieldEventListener;
     forEachField(callback: (field: Field) => void): void;
     findField(callback: (field: Field) => boolean): any;
     hasField(name: string): boolean;
@@ -120,5 +112,13 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     quotedTableName(): any;
     collectionSchema(): string;
     isView(): boolean;
+    protected sequelizeModelOptions(): {
+        modelName: string;
+        sequelize: import("sequelize").Sequelize;
+        tableName: any;
+    };
+    private checkOptions;
+    private checkTableName;
+    private bindFieldEventListener;
 }
 export {};

package/lib/collection.js

@@ -35,6 +35,7 @@ function _sequelize() {
 var _model = require("./model");
 var _repository = require("./repository");
 var _utils = require("./utils");
+var _adjacencyListRepository = require("./tree-repository/adjacency-list-repository");
 const _excluded = ["name"],
   _excluded2 = ["name"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -55,6 +56,30 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 class Collection extends _events().EventEmitter {
+  constructor(options, context) {
+    super();
+    this.options = void 0;
+    this.context = void 0;
+    this.isThrough = void 0;
+    this.fields = new Map();
+    this.model = void 0;
+    this.repository = void 0;
+    this.context = context;
+    this.options = options;
+    this.checkOptions(options);
+    this.bindFieldEventListener();
+    this.modelInit();
+    this.db.modelCollection.set(this.model, this);
+    // set tableName to collection map
+    // the form of key is `${schema}.${tableName}` if schema exists
+    // otherwise is `${tableName}`
+    this.db.tableNameCollectionMap.set(this.getTableNameWithSchemaAsString(), this);
+    if (!options.inherits) {
+      this.setFields(options.fields);
+    }
+    this.setRepository(options.repository);
+    this.setSortable(options.sortable);
+  }
   get filterTargetKey() {
     const targetKey = _lodash().default.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
     if (!targetKey && this.model.rawAttributes['id']) {
@@ -107,53 +132,6 @@ class Collection extends _events().EventEmitter {
       _iterator2.f();
     }
   }
-  constructor(options, context) {
-    super();
-    this.options = void 0;
-    this.context = void 0;
-    this.isThrough = void 0;
-    this.fields = new Map();
-    this.model = void 0;
-    this.repository = void 0;
-    this.context = context;
-    this.options = options;
-    this.checkOptions(options);
-    this.bindFieldEventListener();
-    this.modelInit();
-    this.db.modelCollection.set(this.model, this);
-    // set tableName to collection map
-    // the form of key is `${schema}.${tableName}` if schema exists
-    // otherwise is `${tableName}`
-    this.db.tableNameCollectionMap.set(this.getTableNameWithSchemaAsString(), this);
-    if (!options.inherits) {
-      this.setFields(options.fields);
-    }
-    this.setRepository(options.repository);
-    this.setSortable(options.sortable);
-  }
-  checkOptions(options) {
-    (0, _utils.checkIdentifier)(options.name);
-    this.checkTableName();
-  }
-  checkTableName() {
-    const tableName = this.tableName();
-    var _iterator3 = _createForOfIteratorHelper(this.db.collections),
-      _step3;
-    try {
-      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        const _step3$value = _slicedToArray(_step3.value, 2),
-          k = _step3$value[0],
-          collection = _step3$value[1];
-        if (collection.name != this.options.name && tableName === collection.tableName() && collection.collectionSchema() === this.collectionSchema()) {
-          throw new Error(`collection ${collection.name} and ${this.name} have same tableName "${tableName}"`);
-        }
-      }
-    } catch (err) {
-      _iterator3.e(err);
-    } finally {
-      _iterator3.f();
-    }
-  }
   tableName() {
     const _this$options = this.options,
       name = _this$options.name,
@@ -161,14 +139,6 @@ class Collection extends _events().EventEmitter {
     const tName = tableName || name;
     return this.options.underscored ? (0, _utils.snakeCase)(tName) : tName;
   }
-  sequelizeModelOptions() {
-    const name = this.options.name;
-    return _objectSpread(_objectSpread({}, _lodash().default.omit(this.options, ['name', 'fields', 'model', 'targetKey'])), {}, {
-      modelName: name,
-      sequelize: this.context.database.sequelize,
-      tableName: this.tableName()
-    });
-  }
   /**
    * TODO
    */
@@ -215,17 +185,11 @@ class Collection extends _events().EventEmitter {
     if (typeof repository === 'string') {
       repo = this.context.database.repositories.get(repository) || _repository.Repository;
     }
+    if (this.options.tree == 'adjacency-list' || this.options.tree == 'adjacencyList') {
+      repo = _adjacencyListRepository.AdjacencyListRepository;
+    }
     this.repository = new repo(this);
   }
-  bindFieldEventListener() {
-    this.on('field.afterAdd', field => {
-      field.bind();
-    });
-    this.on('field.afterRemove', field => {
-      field.unbind();
-      this.db.emit('field.afterRemove', field);
-    });
-  }
   forEachField(callback) {
     return [...this.fields.values()].forEach(callback);
   }
@@ -273,10 +237,14 @@ class Collection extends _events().EventEmitter {
         sourceFieldName = _options$source$split2[1];
       const sourceCollection = this.db.collections.get(sourceCollectionName);
       if (!sourceCollection) {
-        throw new Error(`source collection "${sourceCollectionName}" not found for field "${name}" at collection "${this.name}"`);
+        this.db.logger.warn(`source collection "${sourceCollectionName}" not found for field "${name}" at collection "${this.name}"`);
       }
       const sourceField = sourceCollection.fields.get(sourceFieldName);
-      options = _objectSpread(_objectSpread({}, sourceField.options), options);
+      if (!sourceField) {
+        this.db.logger.warn(`source field "${sourceFieldName}" not found for field "${name}" at collection "${this.name}"`);
+      } else {
+        options = _objectSpread(_objectSpread({}, sourceField.options), options);
+      }
     }
     this.emit('field.beforeAdd', name, options, {
       collection: this
@@ -298,13 +266,13 @@ class Collection extends _events().EventEmitter {
     this.emit('field.afterAdd', field);
     // refresh children models
     if (this.isParent()) {
-      var _iterator4 = _createForOfIteratorHelper(this.context.database.inheritanceMap.getChildren(this.name, {
+      var _iterator3 = _createForOfIteratorHelper(this.context.database.inheritanceMap.getChildren(this.name, {
           deep: false
         })),
-        _step4;
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          const child = _step4.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          const child = _step3.value;
           const childCollection = this.db.getCollection(child);
           const existField = childCollection.getField(name);
           if (!existField || existField.options.inherit) {
@@ -314,9 +282,9 @@ class Collection extends _events().EventEmitter {
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
     }
     return field;
@@ -328,34 +296,34 @@ class Collection extends _events().EventEmitter {
     if (resetFields) {
       this.resetFields();
     }
-    var _iterator5 = _createForOfIteratorHelper(fields),
-      _step5;
+    var _iterator4 = _createForOfIteratorHelper(fields),
+      _step4;
     try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        const _ref = _step5.value;
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        const _ref = _step4.value;
         const name = _ref.name,
           options = _objectWithoutProperties(_ref, _excluded);
         this.addField(name, options);
       }
     } catch (err) {
-      _iterator5.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator5.f();
+      _iterator4.f();
     }
   }
   resetFields() {
     const fieldNames = this.fields.keys();
-    var _iterator6 = _createForOfIteratorHelper(fieldNames),
-      _step6;
+    var _iterator5 = _createForOfIteratorHelper(fieldNames),
+      _step5;
     try {
-      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-        const fieldName = _step6.value;
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+        const fieldName = _step5.value;
         this.removeField(fieldName);
       }
     } catch (err) {
-      _iterator6.e(err);
+      _iterator5.e(err);
     } finally {
-      _iterator6.f();
+      _iterator5.f();
     }
   }
   remove() {
@@ -387,13 +355,13 @@ class Collection extends _events().EventEmitter {
     const bool = this.fields.delete(name);
     if (bool) {
       if (this.isParent()) {
-        var _iterator7 = _createForOfIteratorHelper(this.db.inheritanceMap.getChildren(this.name, {
+        var _iterator6 = _createForOfIteratorHelper(this.db.inheritanceMap.getChildren(this.name, {
             deep: false
           })),
-          _step7;
+          _step6;
         try {
-          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-            const child = _step7.value;
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            const child = _step6.value;
             const childCollection = this.db.getCollection(child);
             const existField = childCollection.getField(name);
             if (existField && existField.options.inherit) {
@@ -401,9 +369,9 @@ class Collection extends _events().EventEmitter {
             }
           }
         } catch (err) {
-          _iterator7.e(err);
+          _iterator6.e(err);
         } finally {
-          _iterator7.f();
+          _iterator6.f();
         }
       }
       this.emit('field.afterRemove', field);
@@ -493,11 +461,11 @@ class Collection extends _events().EventEmitter {
     if (name.startsWith(`${indexName.join(',')},`)) {
       return;
     }
-    var _iterator8 = _createForOfIteratorHelper(indexes),
-      _step8;
+    var _iterator7 = _createForOfIteratorHelper(indexes),
+      _step7;
     try {
-      for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-        const item = _step8.value;
+      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+        const item = _step7.value;
         if (_lodash().default.isEqual(item.fields, indexName)) {
           return;
         }
@@ -507,9 +475,9 @@ class Collection extends _events().EventEmitter {
         }
       }
     } catch (err) {
-      _iterator8.e(err);
+      _iterator7.e(err);
     } finally {
-      _iterator8.f();
+      _iterator7.f();
     }
     if (!indexItem) {
       return;
@@ -627,5 +595,45 @@ class Collection extends _events().EventEmitter {
   isView() {
     return false;
   }
+  sequelizeModelOptions() {
+    const name = this.options.name;
+    return _objectSpread(_objectSpread({}, _lodash().default.omit(this.options, ['name', 'fields', 'model', 'targetKey'])), {}, {
+      modelName: name,
+      sequelize: this.context.database.sequelize,
+      tableName: this.tableName()
+    });
+  }
+  checkOptions(options) {
+    (0, _utils.checkIdentifier)(options.name);
+    this.checkTableName();
+  }
+  checkTableName() {
+    const tableName = this.tableName();
+    var _iterator8 = _createForOfIteratorHelper(this.db.collections),
+      _step8;
+    try {
+      for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+        const _step8$value = _slicedToArray(_step8.value, 2),
+          k = _step8$value[0],
+          collection = _step8$value[1];
+        if (collection.name != this.options.name && tableName === collection.tableName() && collection.collectionSchema() === this.collectionSchema()) {
+          throw new Error(`collection ${collection.name} and ${this.name} have same tableName "${tableName}"`);
+        }
+      }
+    } catch (err) {
+      _iterator8.e(err);
+    } finally {
+      _iterator8.f();
+    }
+  }
+  bindFieldEventListener() {
+    this.on('field.afterAdd', field => {
+      field.bind();
+    });
+    this.on('field.afterRemove', field => {
+      field.unbind();
+      this.db.emit('field.afterRemove', field);
+    });
+  }
 }
 exports.Collection = Collection;

package/lib/database.d.ts

@@ -17,11 +17,11 @@ import { ModelHook } from './model-hook';
 import { RelationRepository } from './relation-repository/relation-repository';
 import { Repository } from './repository';
 import { AfterDefineCollectionListener, BeforeDefineCollectionListener, CreateListener, CreateWithAssociationsListener, DatabaseAfterDefineCollectionEventType, DatabaseAfterRemoveCollectionEventType, DatabaseBeforeDefineCollectionEventType, DatabaseBeforeRemoveCollectionEventType, DestroyListener, EventType, ModelCreateEventTypes, ModelCreateWithAssociationsEventTypes, ModelDestroyEventTypes, ModelSaveEventTypes, ModelSaveWithAssociationsEventTypes, ModelUpdateEventTypes, ModelUpdateWithAssociationsEventTypes, ModelValidateEventTypes, RemoveCollectionListener, SaveListener, SaveWithAssociationsListener, SyncListener, UpdateListener, UpdateWithAssociationsListener, ValidateListener } from './types';
-import DatabaseUtils from './database-utils';
-import { BaseValueParser } from './value-parsers';
-import QueryInterface from './query-interface/query-interface';
 import { Logger } from '@nocobase/logger';
 import { CollectionGroupManager } from './collection-group-manager';
+import DatabaseUtils from './database-utils';
+import QueryInterface from './query-interface/query-interface';
+import { BaseValueParser } from './value-parsers';
 export declare type MergeOptions = merge.Options;
 export interface PendingOptions {
     field: RelationField;
@@ -99,6 +99,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     }[]>;
     logger: Logger;
     collectionGroupManager: CollectionGroupManager;
+    emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
     constructor(options: DatabaseOptions);
     setLogger(logger: Logger): void;
     sequelizeOptions(options: any): any;
@@ -165,7 +166,6 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
         from?: string;
         extensions?: ImportFileExtension[];
     }): Promise<Map<string, Collection>>;
-    emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
 }
 export declare function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {
     collectionOptions: CollectionOptions;

package/lib/database.js

@@ -72,11 +72,11 @@ var _migration = require("./migration");
 var _modelHook = require("./model-hook");
 var _operators = _interopRequireDefault(require("./operators"));
 var _utils2 = require("./utils");
+var _collectionGroupManager = require("./collection-group-manager");
 var _databaseUtils = _interopRequireDefault(require("./database-utils"));
 var _listeners = require("./listeners");
-var _valueParsers = require("./value-parsers");
 var _queryInterfaceBuilder = _interopRequireDefault(require("./query-interface/query-interface-builder"));
-var _collectionGroupManager = require("./collection-group-manager");
+var _valueParsers = require("./value-parsers");
 var _viewCollection = require("./view-collection");
 const _excluded = ["drop"],
   _excluded2 = ["retry"];
@@ -246,6 +246,11 @@ class Database extends _events().EventEmitter {
         sequelize: this.sequelize
       }))
     });
+    this.sequelize.beforeDefine((model, opts) => {
+      if (this.options.tablePrefix) {
+        opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
+      }
+    });
     this.collection({
       name: 'migrations',
       autoGenId: false,
@@ -257,11 +262,6 @@ class Database extends _events().EventEmitter {
         name: 'name'
       }]
     });
-    this.sequelize.beforeDefine((model, opts) => {
-      if (this.options.tablePrefix) {
-        opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
-      }
-    });
     this.initListener();
     (0, _utils2.patchSequelizeQueryInterface)(this);
   }
@@ -372,34 +372,6 @@ class Database extends _events().EventEmitter {
         options.schema = this.options.schema;
       }
     });
-    this.on('afterRepositoryFind', ({
-      findOptions,
-      dataCollection,
-      data
-    }) => {
-      if (dataCollection.isParent()) {
-        var _iterator = _createForOfIteratorHelper(data),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            const row = _step.value;
-            const rowCollection = this.tableNameCollectionMap.get(findOptions.raw ? `${row['__schemaName']}.${row['__tableName']}` : `${row.get('__schemaName')}.${row.get('__tableName')}`);
-            if (!rowCollection) {
-              this.logger.warn(`Can not find collection by table name ${JSON.stringify(row)}, current collections: ${Array.from(this.tableNameCollectionMap.keys()).join(', ')}`);
-              return;
-            }
-            const rowCollectionName = rowCollection.name;
-            findOptions.raw ? row['__collection'] = rowCollectionName : row.set('__collection', rowCollectionName, {
-              raw: true
-            });
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      }
-    });
     (0, _listeners.registerBuiltInListeners)(this);
   }
   addMigration(item) {
@@ -415,11 +387,11 @@ class Database extends _events().EventEmitter {
     const files = _glob().default.sync(patten, {
       ignore: ['**/*.d.ts']
     });
-    var _iterator2 = _createForOfIteratorHelper(files),
-      _step2;
+    var _iterator = _createForOfIteratorHelper(files),
+      _step;
     try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        const file = _step2.value;
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        const file = _step.value;
         let filename = (0, _path().basename)(file);
         filename = filename.substring(0, filename.lastIndexOf('.')) || filename;
         this.migrations.add({
@@ -429,9 +401,9 @@ class Database extends _events().EventEmitter {
         });
       }
     } catch (err) {
-      _iterator2.e(err);
+      _iterator.e(err);
     } finally {
-      _iterator2.f();
+      _iterator.f();
     }
   }
   inDialect(...dialect) {
@@ -658,20 +630,20 @@ class Database extends _events().EventEmitter {
         });
         const skip = options.skip || [];
         // @ts-ignore
-        var _iterator3 = _createForOfIteratorHelper(tableNames),
-          _step3;
+        var _iterator2 = _createForOfIteratorHelper(tableNames),
+          _step2;
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            const tableName = _step3.value;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            const tableName = _step2.value;
             if (skip.includes(tableName)) {
               continue;
             }
             yield _this4.sequelize.query(`DROP TABLE IF EXISTS ${tableName} CASCADE`);
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator3.f();
+          _iterator2.f();
         }
         return;
       }
@@ -788,11 +760,11 @@ class Database extends _events().EventEmitter {
       const reader = new _collectionImporter.ImporterReader(options.directory, options.extensions);
       const modules = yield reader.read();
       const result = new Map();
-      var _iterator4 = _createForOfIteratorHelper(modules),
-        _step4;
+      var _iterator3 = _createForOfIteratorHelper(modules),
+        _step3;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          const module = _step4.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          const module = _step3.value;
           if (module.extend) {
             _this10.extendCollection(module.collectionOptions, module.mergeOptions);
           } else {
@@ -804,9 +776,9 @@ class Database extends _events().EventEmitter {
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator4.f();
+        _iterator3.f();
       }
       return result;
     })();

package/lib/eager-loading/eager-loading-tree.d.ts

@@ -0,0 +1,23 @@
+import { Association, Includeable, Model, ModelStatic, Transaction } from 'sequelize';
+interface EagerLoadingNode {
+    model: ModelStatic<any>;
+    association: Association;
+    attributes: Array<string>;
+    rawAttributes: Array<string>;
+    children: Array<EagerLoadingNode>;
+    parent?: EagerLoadingNode;
+    instances?: Array<Model>;
+    order?: any;
+}
+export declare class EagerLoadingTree {
+    root: EagerLoadingNode;
+    constructor(root: EagerLoadingNode);
+    static buildFromSequelizeOptions(options: {
+        model: ModelStatic<any>;
+        rootAttributes: Array<string>;
+        rootOrder?: any;
+        includeOption: Includeable | Includeable[];
+    }): EagerLoadingTree;
+    load(pks: Array<string | number>, transaction?: Transaction): Promise<{}>;
+}
+export {};