@nocobase/database 0.7.0-alpha.6 → 0.7.0-alpha.62

package/src/relation-repository/relation-repository.ts

@@ -53,28 +53,33 @@ export abstract class RelationRepository {
 
     const guard = UpdateGuard.fromOptions(this.targetModel, options);
     const values = options.values;
+    const transaction = await this.getTransaction(options);
 
-    const sourceModel = await this.getSourceModel();
+    const sourceModel = await this.getSourceModel(transaction);
 
-    const instance = await sourceModel[createAccessor](guard.sanitize(options.values), options);
+    const instance = await sourceModel[createAccessor](guard.sanitize(options.values), { ...options, transaction });
 
-    await updateAssociations(instance, values, options);
+    await updateAssociations(instance, values, { ...options, transaction });
 
     if (options.hooks !== false) {
-      await this.db.emitAsync(`${this.targetCollection.name}.afterCreateWithAssociations`, instance, options);
+      await this.db.emitAsync(`${this.targetCollection.name}.afterCreateWithAssociations`, instance, {
+        ...options,
+        transaction,
+      });
       const eventName = `${this.targetCollection.name}.afterSaveWithAssociations`;
-      await this.db.emitAsync(eventName, instance, options);
+      await this.db.emitAsync(eventName, instance, { ...options, transaction });
     }
 
     return instance;
   }
 
-  async getSourceModel(transaction?: any) {
+  async getSourceModel(transaction?: Transaction) {
     if (!this.sourceInstance) {
       this.sourceInstance = await this.sourceCollection.model.findOne({
         where: {
           [this.associationField.sourceKey]: this.sourceKeyValue,
         },
+        transaction,
       });
     }
 

package/src/relation-repository/single-relation-repository.ts

@@ -1,24 +1,24 @@
 import lodash from 'lodash';
-import { SingleAssociationAccessors } from 'sequelize';
+import { SingleAssociationAccessors, Transactionable } from 'sequelize';
 import { Model } from '../model';
-import { Appends, Except, Fields, Filter, TargetKey, TransactionAble, UpdateOptions } from '../repository';
+import { Appends, Except, Fields, Filter, TargetKey, UpdateOptions } from '../repository';
 import { updateModelByValues } from '../update-associations';
 import { RelationRepository, transaction } from './relation-repository';
 
-export interface SingleRelationFindOption extends TransactionAble {
+export interface SingleRelationFindOption extends Transactionable {
   fields?: Fields;
   except?: Except;
   appends?: Appends;
   filter?: Filter;
 }
 
-interface SetOption extends TransactionAble {
+interface SetOption extends Transactionable {
   tk?: TargetKey;
 }
 
 export abstract class SingleRelationRepository extends RelationRepository {
   @transaction()
-  async remove(options?: TransactionAble): Promise<void> {
+  async remove(options?: Transactionable): Promise<void> {
     const transaction = await this.getTransaction(options);
     const sourceModel = await this.getSourceModel(transaction);
     return await sourceModel[this.accessors().set](null, {
@@ -63,7 +63,7 @@ export abstract class SingleRelationRepository extends RelationRepository {
   }
 
   @transaction()
-  async destroy(options?: TransactionAble): Promise<Boolean> {
+  async destroy(options?: Transactionable): Promise<Boolean> {
     const transaction = await this.getTransaction(options);
 
     const target = await this.find({

package/src/repository.ts

@@ -8,7 +8,7 @@ import {
   FindOptions as SequelizeFindOptions,
   ModelCtor,
   Op,
-  Transaction,
+  Transactionable,
   UpdateOptions as SequelizeUpdateOptions
 } from 'sequelize';
 import { Collection } from './collection';
@@ -34,9 +34,7 @@ interface CreateManyOptions extends BulkCreateOptions {
   records: Values[];
 }
 
-export interface TransactionAble {
-  transaction?: Transaction;
-}
+export { Transactionable } from 'sequelize';
 
 export interface FilterAble {
   filter: Filter;
@@ -57,7 +55,7 @@ export type AssociationKeysToBeUpdate = string[];
 
 export type Values = any;
 
-export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, TransactionAble {
+export interface CountOptions extends Omit<SequelizeCreateOptions, 'distinct' | 'where' | 'include'>, Transactionable {
   fields?: Fields;
   filter?: Filter;
 }
@@ -68,7 +66,7 @@ export interface FilterByTk {
 
 export interface FindOptions extends SequelizeFindOptions, CommonFindOptions, FilterByTk {}
 
-export interface CommonFindOptions {
+export interface CommonFindOptions extends Transactionable {
   filter?: Filter;
   fields?: Fields;
   appends?: Appends;

package/src/update-associations.ts

@@ -9,7 +9,6 @@ import {
   Transactionable,
 } from 'sequelize';
 import { Model } from './model';
-import { TransactionAble } from './repository';
 import { UpdateGuard } from './update-guard';
 
 function isUndefinedOrNull(value: any) {
@@ -46,7 +45,7 @@ export function modelAssociationByKey(instance: Model, key: string): Association
 
 type UpdateValue = { [key: string]: any };
 
-interface UpdateOptions extends TransactionAble {
+interface UpdateOptions extends Transactionable {
   filter?: any;
   filterByTk?: number | string;
   // 字段白名单

package/esm/collection-importer.d.ts

@@ -1,7 +0,0 @@
-export declare type ImportFileExtension = 'js' | 'ts' | 'json';
-export declare class ImporterReader {
-    directory: string;
-    extensions: Set<string>;
-    constructor(directory: string, extensions?: ImportFileExtension[]);
-    read(): Promise<any[]>;
-}

package/esm/collection-importer.js

@@ -1,49 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import * as fs from 'fs';
-import lodash from 'lodash';
-import path from 'path';
-function requireModule(module) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (typeof module === 'string') {
-            module = require(module);
-        }
-        if (typeof module !== 'object') {
-            return module;
-        }
-        return module.__esModule ? module.default : module;
-    });
-}
-export class ImporterReader {
-    constructor(directory, extensions) {
-        this.directory = directory;
-        if (!extensions) {
-            extensions = ['js', 'ts', 'json'];
-        }
-        this.extensions = new Set(extensions);
-    }
-    read() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const modules = (yield fs.promises.readdir(this.directory, {
-                encoding: 'utf-8',
-            }))
-                .filter((fileName) => {
-                if (fileName.endsWith('.d.ts')) {
-                    return false;
-                }
-                const ext = path.parse(fileName).ext.replace('.', '');
-                return this.extensions.has(ext);
-            })
-                .map((fileName) => __awaiter(this, void 0, void 0, function* () { return yield requireModule(path.join(this.directory, fileName)); }));
-            return (yield Promise.all(modules)).filter((module) => lodash.isPlainObject(module));
-        });
-    }
-}
-//# sourceMappingURL=collection-importer.js.map

package/esm/collection-importer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"collection-importer.js","sourceRoot":"","sources":["../src/collection-importer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,IAAI,MAAM,MAAM,CAAC;AAIxB,SAAe,aAAa,CAAC,MAAW;;QACtC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC1B;QAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,OAAO,MAAM,CAAC;SACf;QACD,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACrD,CAAC;CAAA;AAED,MAAM,OAAO,cAAc;IAIzB,YAAY,SAAiB,EAAE,UAAkC;QAC/D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAEK,IAAI;;YACR,MAAM,OAAO,GAAG,CACd,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE;gBACxC,QAAQ,EAAE,OAAO;aAClB,CAAC,CACH;iBACE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACnB,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBAC9B,OAAO,KAAK,CAAC;iBACd;gBACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACtD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC,CAAC;iBACD,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE,gDAAC,OAAA,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAA,GAAA,CAAC,CAAC;YAErF,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;QACvF,CAAC;KAAA;CACF","sourcesContent":["import * as fs from 'fs';\nimport lodash from 'lodash';\nimport path from 'path';\n\nexport type ImportFileExtension = 'js' | 'ts' | 'json';\n\nasync function requireModule(module: any) {\n  if (typeof module === 'string') {\n    module = require(module);\n  }\n\n  if (typeof module !== 'object') {\n    return module;\n  }\n  return module.__esModule ? module.default : module;\n}\n\nexport class ImporterReader {\n  directory: string;\n  extensions: Set<string>;\n\n  constructor(directory: string, extensions?: ImportFileExtension[]) {\n    this.directory = directory;\n\n    if (!extensions) {\n      extensions = ['js', 'ts', 'json'];\n    }\n\n    this.extensions = new Set(extensions);\n  }\n\n  async read() {\n    const modules = (\n      await fs.promises.readdir(this.directory, {\n        encoding: 'utf-8',\n      })\n    )\n      .filter((fileName) => {\n        if (fileName.endsWith('.d.ts')) {\n          return false;\n        }\n        const ext = path.parse(fileName).ext.replace('.', '');\n        return this.extensions.has(ext);\n      })\n      .map(async (fileName) => await requireModule(path.join(this.directory, fileName)));\n\n    return (await Promise.all(modules)).filter((module) => lodash.isPlainObject(module));\n  }\n}\n"]}

package/esm/collection.d.ts

@@ -1,73 +0,0 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-import { ModelCtor, ModelOptions, SyncOptions } from 'sequelize';
-import { Database } from './database';
-import { Field, FieldOptions } from './fields';
-import { Model } from './model';
-import { Repository } from './repository';
-export declare type RepositoryType = typeof Repository;
-export declare type CollectionSortable = string | boolean | {
-    name?: string;
-    scopeKey?: string;
-};
-export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {
-    name: string;
-    tableName?: string;
-    filterTargetKey?: string;
-    fields?: FieldOptions[];
-    model?: string | ModelCtor<Model>;
-    repository?: string | RepositoryType;
-    sortable?: CollectionSortable;
-    /**
-     * @default true
-     */
-    autoGenId?: boolean;
-    /**
-     * @default 'options'
-     */
-    magicAttribute?: string;
-    [key: string]: any;
-}
-export interface CollectionContext {
-    database: Database;
-}
-export declare class Collection<TModelAttributes extends {} = any, TCreationAttributes extends {} = TModelAttributes> extends EventEmitter {
-    options: CollectionOptions;
-    context: CollectionContext;
-    isThrough?: boolean;
-    fields: Map<string, any>;
-    model: ModelCtor<Model>;
-    repository: Repository<TModelAttributes, TCreationAttributes>;
-    get filterTargetKey(): string;
-    get name(): string;
-    constructor(options: CollectionOptions, context?: CollectionContext);
-    private sequelizeModelOptions;
-    /**
-     * 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;
-    getField<F extends Field>(name: string): F;
-    addField(name: string, options: FieldOptions): Field;
-    setField(name: string, options: FieldOptions): Field;
-    setFields(fields: FieldOptions[], resetFields?: boolean): void;
-    resetFields(): void;
-    removeField(name: any): boolean;
-    /**
-     * TODO
-     */
-    updateOptions(options: CollectionOptions, mergeOptions?: any): this;
-    setSortable(sortable: any): void;
-    /**
-     * TODO
-     *
-     * @param name
-     * @param options
-     */
-    updateField(name: string, options: FieldOptions): void;
-    sync(syncOptions?: SyncOptions): Promise<void>;
-}

package/esm/collection.js

@@ -1,224 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import merge from 'deepmerge';
-import { EventEmitter } from 'events';
-import { default as lodash, default as _ } from 'lodash';
-import { Model } from './model';
-import { Repository } from './repository';
-export class Collection extends EventEmitter {
-    constructor(options, context) {
-        super();
-        this.fields = new Map();
-        this.context = context;
-        this.options = options;
-        this.bindFieldEventListener();
-        this.modelInit();
-        this.setFields(options.fields);
-        this.setRepository(options.repository);
-        this.setSortable(options.sortable);
-    }
-    get filterTargetKey() {
-        return lodash.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
-    }
-    get name() {
-        return this.options.name;
-    }
-    sequelizeModelOptions() {
-        const { name, tableName } = this.options;
-        return Object.assign(Object.assign({}, _.omit(this.options, ['name', 'fields', 'model', 'targetKey'])), { modelName: name, sequelize: this.context.database.sequelize, tableName: tableName || name });
-    }
-    /**
-     * TODO
-     */
-    modelInit() {
-        if (this.model) {
-            return;
-        }
-        const { name, model, autoGenId = true } = this.options;
-        let M = Model;
-        if (this.context.database.sequelize.isDefined(name)) {
-            const m = this.context.database.sequelize.model(name);
-            if (m.isThrough) {
-                // @ts-ignore
-                this.model = m;
-                // @ts-ignore
-                this.model.database = this.context.database;
-                // @ts-ignore
-                this.model.collection = this;
-                return;
-            }
-        }
-        if (typeof model === 'string') {
-            M = this.context.database.models.get(model) || Model;
-        }
-        else if (model) {
-            M = model;
-        }
-        // @ts-ignore
-        this.model = class extends M {
-        };
-        this.model.init(null, this.sequelizeModelOptions());
-        if (!autoGenId) {
-            this.model.removeAttribute('id');
-        }
-        // @ts-ignore
-        this.model.database = this.context.database;
-        // @ts-ignore
-        this.model.collection = this;
-    }
-    setRepository(repository) {
-        let repo = Repository;
-        if (typeof repository === 'string') {
-            repo = this.context.database.repositories.get(repository) || Repository;
-        }
-        this.repository = new repo(this);
-    }
-    bindFieldEventListener() {
-        this.on('field.afterAdd', (field) => {
-            field.bind();
-        });
-        this.on('field.afterRemove', (field) => field.unbind());
-    }
-    forEachField(callback) {
-        return [...this.fields.values()].forEach(callback);
-    }
-    findField(callback) {
-        return [...this.fields.values()].find(callback);
-    }
-    hasField(name) {
-        return this.fields.has(name);
-    }
-    getField(name) {
-        return this.fields.get(name);
-    }
-    addField(name, options) {
-        return this.setField(name, options);
-    }
-    setField(name, options) {
-        const { database } = this.context;
-        const field = database.buildField(Object.assign({ name }, options), Object.assign(Object.assign({}, this.context), { collection: this }));
-        this.removeField(name);
-        this.fields.set(name, field);
-        this.emit('field.afterAdd', field);
-        return field;
-    }
-    setFields(fields, resetFields = true) {
-        if (!Array.isArray(fields)) {
-            return;
-        }
-        if (resetFields) {
-            this.resetFields();
-        }
-        for (let _a of fields) {
-            const { name } = _a, options = __rest(_a, ["name"]);
-            this.addField(name, options);
-        }
-    }
-    resetFields() {
-        const fieldNames = this.fields.keys();
-        for (const fieldName of fieldNames) {
-            this.removeField(fieldName);
-        }
-    }
-    removeField(name) {
-        if (!this.fields.has(name)) {
-            return;
-        }
-        const field = this.fields.get(name);
-        const bool = this.fields.delete(name);
-        if (bool) {
-            this.emit('field.afterRemove', field);
-        }
-        return bool;
-    }
-    /**
-     * TODO
-     */
-    updateOptions(options, mergeOptions) {
-        let newOptions = lodash.cloneDeep(options);
-        newOptions = merge(this.options, newOptions, mergeOptions);
-        this.context.database.emit('beforeUpdateCollection', this, newOptions);
-        this.setFields(options.fields, false);
-        this.setRepository(options.repository);
-        this.context.database.emit('afterUpdateCollection', this);
-        return this;
-    }
-    setSortable(sortable) {
-        if (!sortable) {
-            return;
-        }
-        if (sortable === true) {
-            this.setField('sort', {
-                type: 'sort',
-                hidden: true,
-            });
-        }
-        if (typeof sortable === 'string') {
-            this.setField(sortable, {
-                type: 'sort',
-                hidden: true,
-            });
-        }
-        else if (typeof sortable === 'object') {
-            const { name } = sortable, opts = __rest(sortable, ["name"]);
-            this.setField(name || 'sort', Object.assign({ type: 'sort', hidden: true }, opts));
-        }
-    }
-    /**
-     * TODO
-     *
-     * @param name
-     * @param options
-     */
-    updateField(name, options) {
-        if (!this.hasField(name)) {
-            throw new Error(`field ${name} not exists`);
-        }
-        if (options.name && options.name !== name) {
-            this.removeField(name);
-        }
-        this.setField(options.name || name, options);
-    }
-    sync(syncOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const modelNames = [this.model.name];
-            const associations = this.model.associations;
-            for (const associationKey in associations) {
-                const association = associations[associationKey];
-                modelNames.push(association.target.name);
-                if (association.through) {
-                    modelNames.push(association.through.model.name);
-                }
-            }
-            const models = [];
-            // @ts-ignore
-            this.context.database.sequelize.modelManager.forEachModel((model) => {
-                if (modelNames.includes(model.name)) {
-                    models.push(model);
-                }
-            });
-            for (const model of models) {
-                yield model.sync(syncOptions);
-            }
-        });
-    }
-}
-//# sourceMappingURL=collection.js.map

package/esm/collection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"collection.js","sourceRoot":"","sources":["../src/collection.ts"],"names":[],"mappings":"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","sourcesContent":["import merge from 'deepmerge';\nimport { EventEmitter } from 'events';\nimport { default as lodash, default as _ } from 'lodash';\nimport { col, ModelCtor, ModelOptions, SyncOptions } from 'sequelize';\nimport { Database } from './database';\nimport { Field, FieldOptions } from './fields';\nimport { Model } from './model';\nimport { Repository } from './repository';\n\nexport type RepositoryType = typeof Repository;\n\nexport type CollectionSortable = string | boolean | { name?: string; scopeKey?: string };\n\nexport interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {\n  name: string;\n  tableName?: string;\n  filterTargetKey?: string;\n  fields?: FieldOptions[];\n  model?: string | ModelCtor<Model>;\n  repository?: string | RepositoryType;\n  sortable?: CollectionSortable;\n  /**\n   * @default true\n   */\n  autoGenId?: boolean;\n  /**\n   * @default 'options'\n   */\n  magicAttribute?: string;\n  [key: string]: any;\n}\n\nexport interface CollectionContext {\n  database: Database;\n}\n\nexport class Collection<\n  TModelAttributes extends {} = any,\n  TCreationAttributes extends {} = TModelAttributes,\n> extends EventEmitter {\n  options: CollectionOptions;\n  context: CollectionContext;\n  isThrough?: boolean;\n  fields: Map<string, any> = new Map<string, any>();\n  model: ModelCtor<Model>;\n  repository: Repository<TModelAttributes, TCreationAttributes>;\n\n  get filterTargetKey() {\n    return lodash.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);\n  }\n\n  get name() {\n    return this.options.name;\n  }\n\n  constructor(options: CollectionOptions, context?: CollectionContext) {\n    super();\n    this.context = context;\n    this.options = options;\n    this.bindFieldEventListener();\n    this.modelInit();\n    this.setFields(options.fields);\n    this.setRepository(options.repository);\n    this.setSortable(options.sortable);\n  }\n\n  private sequelizeModelOptions() {\n    const { name, tableName } = this.options;\n    return {\n      ..._.omit(this.options, ['name', 'fields', 'model', 'targetKey']),\n      modelName: name,\n      sequelize: this.context.database.sequelize,\n      tableName: tableName || name,\n    };\n  }\n\n  /**\n   * TODO\n   */\n  modelInit() {\n    if (this.model) {\n      return;\n    }\n    const { name, model, autoGenId = true } = this.options;\n    let M: ModelCtor<Model> = Model;\n    if (this.context.database.sequelize.isDefined(name)) {\n      const m = this.context.database.sequelize.model(name);\n      if ((m as any).isThrough) {\n        // @ts-ignore\n        this.model = m;\n        // @ts-ignore\n        this.model.database = this.context.database;\n        // @ts-ignore\n        this.model.collection = this;\n        return;\n      }\n    }\n    if (typeof model === 'string') {\n      M = this.context.database.models.get(model) || Model;\n    } else if (model) {\n      M = model;\n    }\n    // @ts-ignore\n    this.model = class extends M {};\n    this.model.init(null, this.sequelizeModelOptions());\n\n    if (!autoGenId) {\n      this.model.removeAttribute('id');\n    }\n\n    // @ts-ignore\n    this.model.database = this.context.database;\n    // @ts-ignore\n    this.model.collection = this;\n  }\n\n  setRepository(repository?: RepositoryType | string) {\n    let repo = Repository;\n    if (typeof repository === 'string') {\n      repo = this.context.database.repositories.get(repository) || Repository;\n    }\n    this.repository = new repo(this);\n  }\n\n  private bindFieldEventListener() {\n    this.on('field.afterAdd', (field: Field) => {\n      field.bind();\n    });\n    this.on('field.afterRemove', (field) => field.unbind());\n  }\n\n  forEachField(callback: (field: Field) => void) {\n    return [...this.fields.values()].forEach(callback);\n  }\n\n  findField(callback: (field: Field) => boolean) {\n    return [...this.fields.values()].find(callback);\n  }\n\n  hasField(name: string) {\n    return this.fields.has(name);\n  }\n\n  getField<F extends Field>(name: string): F {\n    return this.fields.get(name);\n  }\n\n  addField(name: string, options: FieldOptions): Field {\n    return this.setField(name, options);\n  }\n\n  setField(name: string, options: FieldOptions): Field {\n    const { database } = this.context;\n\n    const field = database.buildField(\n      { name, ...options },\n      {\n        ...this.context,\n        collection: this,\n      },\n    );\n    this.removeField(name);\n    this.fields.set(name, field);\n    this.emit('field.afterAdd', field);\n    return field;\n  }\n\n  setFields(fields: FieldOptions[], resetFields = true) {\n    if (!Array.isArray(fields)) {\n      return;\n    }\n\n    if (resetFields) {\n      this.resetFields();\n    }\n\n    for (const { name, ...options } of fields) {\n      this.addField(name, options);\n    }\n  }\n\n  resetFields() {\n    const fieldNames = this.fields.keys();\n    for (const fieldName of fieldNames) {\n      this.removeField(fieldName);\n    }\n  }\n\n  removeField(name) {\n    if (!this.fields.has(name)) {\n      return;\n    }\n    const field = this.fields.get(name);\n    const bool = this.fields.delete(name);\n    if (bool) {\n      this.emit('field.afterRemove', field);\n    }\n    return bool;\n  }\n\n  /**\n   * TODO\n   */\n  updateOptions(options: CollectionOptions, mergeOptions?: any) {\n    let newOptions = lodash.cloneDeep(options);\n    newOptions = merge(this.options, newOptions, mergeOptions);\n\n    this.context.database.emit('beforeUpdateCollection', this, newOptions);\n\n    this.setFields(options.fields, false);\n    this.setRepository(options.repository);\n\n    this.context.database.emit('afterUpdateCollection', this);\n\n    return this;\n  }\n\n  setSortable(sortable) {\n    if (!sortable) {\n      return;\n    }\n    if (sortable === true) {\n      this.setField('sort', {\n        type: 'sort',\n        hidden: true,\n      });\n    }\n    if (typeof sortable === 'string') {\n      this.setField(sortable, {\n        type: 'sort',\n        hidden: true,\n      });\n    } else if (typeof sortable === 'object') {\n      const { name, ...opts } = sortable;\n      this.setField(name || 'sort', { type: 'sort', hidden: true, ...opts });\n    }\n  }\n\n  /**\n   * TODO\n   *\n   * @param name\n   * @param options\n   */\n  updateField(name: string, options: FieldOptions) {\n    if (!this.hasField(name)) {\n      throw new Error(`field ${name} not exists`);\n    }\n\n    if (options.name && options.name !== name) {\n      this.removeField(name);\n    }\n\n    this.setField(options.name || name, options);\n  }\n\n  async sync(syncOptions?: SyncOptions) {\n    const modelNames = [this.model.name];\n\n    const associations = this.model.associations;\n\n    for (const associationKey in associations) {\n      const association = associations[associationKey];\n      modelNames.push(association.target.name);\n      if ((<any>association).through) {\n        modelNames.push((<any>association).through.model.name);\n      }\n    }\n\n    const models: ModelCtor<Model>[] = [];\n    // @ts-ignore\n    this.context.database.sequelize.modelManager.forEachModel((model) => {\n      if (modelNames.includes(model.name)) {\n        models.push(model);\n      }\n    });\n\n    for (const model of models) {\n      await model.sync(syncOptions);\n    }\n  }\n}\n"]}

package/esm/database.d.ts

@@ -1,101 +0,0 @@
-/// <reference types="node" />
-import { AsyncEmitter } from '@nocobase/utils';
-import merge from 'deepmerge';
-import { EventEmitter } from 'events';
-import { ModelCtor, Options, QueryInterfaceDropAllTablesOptions, Sequelize, SyncOptions } from 'sequelize';
-import { Collection, CollectionOptions, RepositoryType } from './collection';
-import { ImportFileExtension } from './collection-importer';
-import * as FieldTypes from './fields';
-import { Field, FieldContext, RelationField } from './fields';
-import { Model } from './model';
-import { ModelHook } from './model-hook';
-import { RelationRepository } from './relation-repository/relation-repository';
-import { Repository } from './repository';
-export interface MergeOptions extends merge.Options {
-}
-export interface PendingOptions {
-    field: RelationField;
-    model: ModelCtor<Model>;
-}
-interface MapOf<T> {
-    [key: string]: T;
-}
-export interface IDatabaseOptions extends Options {
-    tablePrefix?: string;
-}
-export declare type DatabaseOptions = IDatabaseOptions | Sequelize;
-interface RegisterOperatorsContext {
-    db?: Database;
-    path?: string;
-    field?: Field;
-    app?: any;
-}
-export interface CleanOptions extends QueryInterfaceDropAllTablesOptions {
-    drop?: boolean;
-}
-declare type OperatorFunc = (value: any, ctx?: RegisterOperatorsContext) => any;
-export declare class Database extends EventEmitter implements AsyncEmitter {
-    sequelize: Sequelize;
-    fieldTypes: Map<any, any>;
-    options: IDatabaseOptions;
-    models: Map<string, ModelCtor<Model<any, any>>>;
-    repositories: Map<string, typeof Repository>;
-    operators: Map<any, any>;
-    collections: Map<string, Collection<any, any>>;
-    pendingFields: Map<string, FieldTypes.RelationField[]>;
-    modelCollection: Map<ModelCtor<any>, Collection<any, any>>;
-    modelHook: ModelHook;
-    delayCollectionExtend: Map<string, {
-        collectionOptions: CollectionOptions;
-        mergeOptions?: any;
-    }[]>;
-    constructor(options: DatabaseOptions);
-    /**
-     * Add collection to database
-     * @param options
-     */
-    collection<Attributes = any, CreateAttributes = Attributes>(options: CollectionOptions): Collection<Attributes, CreateAttributes>;
-    getTablePrefix(): string;
-    /**
-     * get exists collection by its name
-     * @param name
-     */
-    getCollection(name: string): Collection;
-    hasCollection(name: string): boolean;
-    removeCollection(name: string): void;
-    getModel<M extends Model>(name: string): ModelCtor<M>;
-    getRepository<R extends Repository>(name: string): R;
-    getRepository<R extends RelationRepository>(name: string, relationId: string | number): R;
-    addPendingField(field: RelationField): void;
-    removePendingField(field: RelationField): void;
-    registerFieldTypes(fieldTypes: MapOf<typeof Field>): void;
-    registerModels(models: MapOf<ModelCtor<any>>): void;
-    registerRepositories(repositories: MapOf<RepositoryType>): void;
-    initOperators(): void;
-    registerOperators(operators: MapOf<OperatorFunc>): void;
-    buildField(options: any, context: FieldContext): any;
-    sync(options?: SyncOptions): Promise<Sequelize>;
-    clean(options: CleanOptions): Promise<void>;
-    isSqliteMemory(): boolean;
-    reconnect(): Promise<void>;
-    closed(): any;
-    close(): Promise<void>;
-    on(event: string | symbol, listener: (...args: any[]) => void): this;
-    import(options: {
-        directory: string;
-        extensions?: ImportFileExtension[];
-    }): Promise<Map<string, Collection>>;
-    emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
-}
-export declare function extend(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {
-    collectionOptions: CollectionOptions;
-    mergeOptions: MergeOptions;
-    extend: boolean;
-};
-export declare const defineCollection: (collectionOptions: CollectionOptions) => CollectionOptions;
-export declare const extendCollection: (collectionOptions: CollectionOptions, mergeOptions?: MergeOptions) => {
-    collectionOptions: CollectionOptions;
-    mergeOptions: MergeOptions;
-    extend: boolean;
-};
-export default Database;