@nocobase/database 0.9.2-alpha.2 → 0.9.2-alpha.4

package/lib/collection.d.ts

@@ -14,6 +14,14 @@ declare type dumpable = 'required' | 'optional' | 'skip';
 export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {
     name: string;
     namespace?: string;
+    /**
+     * Used for @nocobase/plugin-duplicator
+     * @see packages/core/database/src/collection-group-manager.tss
+     *
+     * @prop {'required' | 'optional' | 'skip'} dumpable - Determine whether the collection is dumped
+     * @prop {string[] | string} [with] - Collections dumped with this collection
+     * @prop {any} [delayRestore] - A function to execute after all collections are restored
+     */
     duplicator?: dumpable | {
         dumpable: dumpable;
         with?: string[] | string;

package/lib/collection.js

@@ -56,7 +56,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 {
   get filterTargetKey() {
-    let targetKey = _lodash().default.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
+    const targetKey = _lodash().default.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
     if (!targetKey && this.model.rawAttributes['id']) {
       return 'id';
     }
@@ -273,7 +273,7 @@ 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`);
+        throw new Error(`source collection "${sourceCollectionName}" not found for field "${name}" at collection "${this.name}"`);
       }
       const sourceField = sourceCollection.fields.get(sourceFieldName);
       options = _objectSpread(_objectSpread({}, sourceField.options), options);
@@ -469,7 +469,7 @@ class Collection extends _events().EventEmitter {
       return;
     }
     // collection defined indexes
-    let indexes = this.model.options.indexes || [];
+    const indexes = this.model.options.indexes || [];
     let indexName = [];
     let indexItem;
     if (typeof index === 'string') {

package/lib/database.d.ts

@@ -22,8 +22,7 @@ import { BaseValueParser } from './value-parsers';
 import QueryInterface from './query-interface/query-interface';
 import { Logger } from '@nocobase/logger';
 import { CollectionGroupManager } from './collection-group-manager';
-export interface MergeOptions extends merge.Options {
-}
+export declare type MergeOptions = merge.Options;
 export interface PendingOptions {
     field: RelationField;
     model: ModelStatic<Model>;
@@ -170,7 +169,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
 }
 export declare function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): {
     collectionOptions: CollectionOptions;
-    mergeOptions: MergeOptions;
+    mergeOptions: merge.Options;
     extend: boolean;
 };
 export declare const extend: typeof extendCollection;

package/lib/database.js

@@ -482,7 +482,7 @@ class Database extends _events().EventEmitter {
       collectionName = _path$split2[0],
       associationName = _path$split2[1],
       args = _path$split2.slice(2);
-    let collection = this.getCollection(collectionName);
+    const collection = this.getCollection(collectionName);
     if (!collection) {
       return;
     }
@@ -507,7 +507,7 @@ class Database extends _events().EventEmitter {
       _name$split2 = _slicedToArray(_name$split, 2),
       collectionName = _name$split2[0],
       associationName = _name$split2[1];
-    let collection = this.collections.get(collectionName);
+    const collection = this.collections.get(collectionName);
     if (associationName) {
       var _collection$getField;
       const target = (_collection$getField = collection.getField(associationName)) === null || _collection$getField === void 0 ? void 0 : _collection$getField.target;

package/lib/fields/relation-field.d.ts

@@ -1,6 +1,5 @@
 import { BaseFieldOptions, Field } from './field';
-export interface BaseRelationFieldOptions extends BaseFieldOptions {
-}
+export declare type BaseRelationFieldOptions = BaseFieldOptions;
 export interface MultipleRelationFieldOptions extends BaseRelationFieldOptions {
     sortBy?: string | string[];
 }

package/lib/filter-parser.js

@@ -101,7 +101,7 @@ class FilterParser {
         continue;
       }
       debug('handle filter key "%s: "%s"', key, value);
-      let keys = key.split('.');
+      const keys = key.split('.');
       // paths ?
       const paths = [];
       // origins ?
@@ -223,7 +223,7 @@ class FilterParser {
   getFieldNameFromQueryPath(queryPath) {
     const paths = queryPath.split('.');
     let fieldName;
-    let fullPaths = [];
+    const fullPaths = [];
     var _iterator = _createForOfIteratorHelper(paths),
       _step;
     try {

package/lib/model-hook.d.ts

@@ -4,7 +4,7 @@ export declare class ModelHook {
     database: Database;
     boundEvents: Set<string>;
     constructor(database: Database);
-    match(event: string | Symbol): keyof SequelizeHooks | null;
+    match(event: string | symbol): keyof SequelizeHooks | null;
     findModelName(hookArgs: any): any;
     bindEvent(type: any): void;
     hasBoundEvent(type: any): boolean;

package/lib/operators/empty.js

@@ -28,7 +28,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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; }
 const findFilterFieldType = ctx => {
   const db = ctx.db;
-  let path = ctx.path.split('.');
+  const path = ctx.path.split('.');
   // remove operators
   path.pop();
   const fieldName = path.pop();

package/lib/options-parser.js

@@ -79,7 +79,7 @@ class OptionsParser {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         const sortKey = _step.value;
         let direction = sortKey.startsWith('-') ? 'DESC' : 'ASC';
-        let sortField = sortKey.replace('-', '').split('.');
+        const sortField = sortKey.replace('-', '').split('.');
         if (this.database.inDialect('postgres', 'sqlite')) {
           direction = `${direction} NULLS LAST`;
         }
@@ -197,7 +197,7 @@ class OptionsParser {
       const exceptPath = except.split('.');
       const association = exceptPath[0];
       const lastLevel = exceptPath.length <= 2;
-      let existIncludeIndex = queryParams['include'].findIndex(include => include['association'] == association);
+      const existIncludeIndex = queryParams['include'].findIndex(include => include['association'] == association);
       if (existIncludeIndex == -1) {
         // if include not exists, ignore this except
         return;

package/lib/relation-repository/belongs-to-many-repository.d.ts

@@ -10,7 +10,7 @@ interface IBelongsToManyRepository<M extends Model> {
     findOne(options?: FindOneOptions): Promise<M>;
     create(options?: CreateOptions): Promise<M>;
     update(options?: UpdateOptions): Promise<M>;
-    destroy(options?: number | string | number[] | string[] | DestroyOptions): Promise<Boolean>;
+    destroy(options?: number | string | number[] | string[] | DestroyOptions): Promise<boolean>;
     set(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     add(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     remove(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
@@ -21,7 +21,7 @@ interface IBelongsToManyRepository<M extends Model> {
 }
 export declare class BelongsToManyRepository extends MultipleRelationRepository implements IBelongsToManyRepository<any> {
     create(options?: CreateBelongsToManyOptions): Promise<any>;
-    destroy(options?: TargetKey | TargetKey[] | DestroyOptions): Promise<Boolean>;
+    destroy(options?: TargetKey | TargetKey[] | DestroyOptions): Promise<boolean>;
     protected setTargets(call: 'add' | 'set', options: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions): Promise<void>;
     add(options: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions): Promise<void>;
     set(options: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions): Promise<void>;

package/lib/relation-repository/belongs-to-repository.d.ts

@@ -1,14 +1,13 @@
 import { Model } from '../model';
 import { CreateOptions, UpdateOptions } from '../repository';
 import { SingleRelationFindOption, SingleRelationRepository } from './single-relation-repository';
-interface BelongsToFindOptions extends SingleRelationFindOption {
-}
+declare type BelongsToFindOptions = SingleRelationFindOption;
 interface IBelongsToRepository<M extends Model> {
     find(options?: BelongsToFindOptions): Promise<M>;
     findOne(options?: BelongsToFindOptions): Promise<M>;
     create(options?: CreateOptions): Promise<M>;
     update(options?: UpdateOptions): Promise<M>;
-    destroy(): Promise<Boolean>;
+    destroy(): Promise<boolean>;
     set(primaryKey: any): Promise<void>;
     remove(): Promise<void>;
 }

package/lib/relation-repository/hasmany-repository.d.ts

@@ -7,14 +7,14 @@ interface IHasManyRepository<M extends Model> {
     findOne(options?: FindOneOptions): Promise<M>;
     create(options?: CreateOptions): Promise<M>;
     update(options?: UpdateOptions): Promise<M>;
-    destroy(options?: TK | DestroyOptions): Promise<Boolean>;
+    destroy(options?: TK | DestroyOptions): Promise<boolean>;
     set(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     add(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     remove(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
 }
 export declare class HasManyRepository extends MultipleRelationRepository implements IHasManyRepository<any> {
     find(options?: FindOptions): Promise<any>;
-    destroy(options?: TK | DestroyOptions): Promise<Boolean>;
+    destroy(options?: TK | DestroyOptions): Promise<boolean>;
     handleKeyOfAdd(options: any): any;
     set(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     add(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;

package/lib/relation-repository/hasone-repository.d.ts

@@ -6,7 +6,7 @@ interface IHasOneRepository<M extends Model> {
     findOne(options?: SingleRelationFindOption): Promise<M>;
     create(options?: CreateOptions): Promise<M>;
     update(options?: any): Promise<M>;
-    destroy(): Promise<Boolean>;
+    destroy(): Promise<boolean>;
     set(primaryKey: any): Promise<void>;
     remove(): Promise<void>;
 }

package/lib/relation-repository/multiple-relation-repository.d.ts

@@ -13,8 +13,8 @@ export declare abstract class MultipleRelationRepository extends RelationReposit
     findOne(options?: FindOneOptions): Promise<any>;
     remove(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
     update(options?: UpdateOptions): Promise<any>;
-    destroy(options?: TK | DestroyOptions): Promise<Boolean>;
-    protected destroyByFilter(filter: Filter, transaction?: Transaction): Promise<Boolean>;
+    destroy(options?: TK | DestroyOptions): Promise<boolean>;
+    protected destroyByFilter(filter: Filter, transaction?: Transaction): Promise<boolean>;
     protected filterHasInclude(filter: Filter, options?: any): boolean;
     protected accessors(): MultiAssociationAccessors;
 }

package/lib/relation-repository/single-relation-repository.d.ts

@@ -16,7 +16,7 @@ export declare abstract class SingleRelationRepository extends RelationRepositor
     set(options: TargetKey | SetOption): Promise<void>;
     find(options?: SingleRelationFindOption): Promise<Model<any> | null>;
     findOne(options?: SingleRelationFindOption): Promise<Model<any>>;
-    destroy(options?: Transactionable): Promise<Boolean>;
+    destroy(options?: Transactionable): Promise<boolean>;
     update(options: UpdateOptions): Promise<any>;
     accessors(): SingleAssociationAccessors;
 }

package/lib/relation-repository/single-relation-repository.js

@@ -44,7 +44,7 @@ class SingleRelationRepository extends _relationRepository.RelationRepository {
     var _this2 = this;
     return _asyncToGenerator(function* () {
       const transaction = yield _this2.getTransaction(options);
-      let handleKey = _lodash().default.isPlainObject(options) ? options.tk : options;
+      const handleKey = _lodash().default.isPlainObject(options) ? options.tk : options;
       const sourceModel = yield _this2.getSourceModel(transaction);
       return yield sourceModel[_this2.accessors().set](handleKey, {
         transaction

package/lib/update-associations.js

@@ -310,7 +310,7 @@ function _updateSingleAssociation() {
         dataKey = M.primaryKeyAttribute;
       }
       if (isStringOrNumber(value[dataKey])) {
-        let instance = yield M.findOne({
+        const instance = yield M.findOne({
           where: {
             [dataKey]: value[dataKey]
           },

package/lib/utils.js

@@ -147,7 +147,7 @@ function percent2float(value) {
   if (!value.endsWith('%')) {
     return NaN;
   }
-  let val = value.substring(0, value.length - 1);
+  const val = value.substring(0, value.length - 1);
   if (isNaN(+val)) {
     return NaN;
   }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.9.2-alpha.2",
+  "version": "0.9.2-alpha.4",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.9.2-alpha.2",
-    "@nocobase/utils": "0.9.2-alpha.2",
+    "@nocobase/logger": "0.9.2-alpha.4",
+    "@nocobase/utils": "0.9.2-alpha.4",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
@@ -28,5 +28,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
+  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
 }

package/src/__tests__/field-options/hidden.test.ts

@@ -234,10 +234,12 @@ describe('hidden field options', () => {
     await repo.create({
       values: {
         title: 'post1',
-        users: [{
-          name: 'abc',
-          password: '123',
-        }],
+        users: [
+          {
+            name: 'abc',
+            password: '123',
+          },
+        ],
       },
     });
     const instance = await repo.findOne({
@@ -284,10 +286,12 @@ describe('hidden field options', () => {
     await repo.create({
       values: {
         title: 'post1',
-        users: [{
-          name: 'abc',
-          password: '123',
-        }],
+        users: [
+          {
+            name: 'abc',
+            password: '123',
+          },
+        ],
       },
     });
     const instance = await repo.findOne({

package/src/__tests__/fields/belongs-to-field.test.ts

@@ -65,10 +65,8 @@ describe('belongs to field', () => {
 
   it('custom targetKey and foreignKey', async () => {
     db.collection({
-      name: "posts",
-      fields: [
-        { type: "string", name: "key" },
-      ]
+      name: 'posts',
+      fields: [{ type: 'string', name: 'key' }],
     });
 
     const Comment = db.collection({
@@ -118,7 +116,6 @@ describe('belongs to field', () => {
       error = e;
     }
 
-
     expect(error).toBeInstanceOf(IdentifierError);
   });
 

package/src/__tests__/fields/date.test.ts

@@ -10,9 +10,7 @@ describe('date-field', () => {
     db = mockDatabase();
     db.collection({
       name: 'tests',
-      fields: [
-        { name: 'date1', type: 'date' },
-      ],
+      fields: [{ name: 'date1', type: 'date' }],
     });
     await db.sync();
     repository = db.getRepository('tests');

package/src/__tests__/fields/has-many-field.test.ts

@@ -186,7 +186,7 @@ describe('has many field', () => {
         name: 'comments',
         fields: [
           { type: 'string', name: 'content' },
-          { type: 'belongsTo', name: 'post', onDelete: "CASCADE" },
+          { type: 'belongsTo', name: 'post', onDelete: 'CASCADE' },
         ],
       });
 

package/src/__tests__/filter.test.ts

@@ -14,6 +14,47 @@ describe('filter', () => {
     await db.close();
   });
 
+  it('should filter by hasMany association field', async () => {
+    const DeptCollection = db.collection({
+      name: 'depts',
+      fields: [
+        { type: 'string', name: 'name' },
+        { type: 'belongsTo', name: 'org', target: 'orgs' },
+      ],
+    });
+
+    const OrgCollection = db.collection({
+      name: 'orgs',
+      fields: [
+        { type: 'string', name: 'name' },
+        { type: 'hasMany', name: 'depts', target: 'depts' },
+      ],
+    });
+
+    await db.sync();
+
+    await OrgCollection.repository.create({
+      values: [
+        {
+          name: 'org1',
+          depts: [{ name: 'dept1' }, { name: 'dept2' }],
+        },
+        {
+          name: 'org2',
+          depts: [{ name: 'dept3' }, { name: 'dept4' }],
+        },
+      ],
+    });
+
+    const dept1 = await DeptCollection.repository.findOne({});
+
+    const orgs = await OrgCollection.repository.find({
+      filter: { $and: [{ depts: { id: { $eq: dept1.get('id') } } }] },
+    });
+
+    expect(orgs.length).toBe(1);
+  });
+
   it('should filter by association field', async () => {
     const UserCollection = db.collection({
       name: 'users',

package/src/__tests__/hooks/afterCreateWithAssociations.test.ts

@@ -25,8 +25,7 @@ describe('afterCreateWithAssociations', () => {
       await repo.create({
         values: {},
       });
-    } catch (error) {
-    }
+    } catch (error) {}
     const count = await repo.count();
     expect(count).toBe(0);
   });

package/src/__tests__/migrator.test.ts

@@ -1,13 +1,12 @@
 import { Database, Migration, mockDatabase } from '@nocobase/database';
 import { resolve } from 'path';
 
-const names = (migrations: Array<{ name: string }>) => migrations.map(m => m.name);
+const names = (migrations: Array<{ name: string }>) => migrations.map((m) => m.name);
 
 describe('migrator', () => {
   let db: Database;
 
   beforeEach(async () => {
-
     db = mockDatabase({
       tablePrefix: 'test_',
     });

package/src/__tests__/model-hook.test.ts

@@ -31,7 +31,7 @@ describe('model hook', () => {
     test('sequelize model hooks with existing collection', async () => {
       db.collection({
         name: 'posts',
-        fields: []
+        fields: [],
       });
       const matcher = db.modelHook.match('posts.beforeCreate');
       expect(matcher).toEqual('beforeCreate');
@@ -45,7 +45,7 @@ describe('model hook', () => {
     test('customized model hooks', async () => {
       db.collection({
         name: 'posts',
-        fields: []
+        fields: [],
       });
       const matcher = db.modelHook.match('posts.beforeCreateWithAssociations');
       expect(matcher).toBeNull();

package/src/__tests__/operator/eq.test.ts

@@ -22,11 +22,7 @@ describe('eq operator', () => {
 
   it('should eq with array', async () => {
     await db.getRepository('tests').create({
-      values: [
-        { name: '123' },
-        { name: '234' },
-        { name: '345' },
-      ]
+      values: [{ name: '123' }, { name: '234' }, { name: '345' }],
     });
 
     const results = await db.getRepository('tests').count({
@@ -40,11 +36,7 @@ describe('eq operator', () => {
 
   it('should eq with array', async () => {
     await db.getRepository('tests').create({
-      values: [
-        { name: '123' },
-        { name: '234' },
-        { name: '345' },
-      ]
+      values: [{ name: '123' }, { name: '234' }, { name: '345' }],
     });
 
     const results = await db.getRepository('tests').count({
@@ -58,11 +50,7 @@ describe('eq operator', () => {
 
   it('should eq with array', async () => {
     await db.getRepository('tests').create({
-      values: [
-        { name: '123' },
-        { name: '234' },
-        { name: '345' },
-      ]
+      values: [{ name: '123' }, { name: '234' }, { name: '345' }],
     });
 
     const results = await db.getRepository('tests').count({

package/src/__tests__/operator/ne.test.ts

@@ -45,11 +45,7 @@ describe('ne operator', () => {
 
   it('should ne with array', async () => {
     await db.getRepository('tests').create({
-      values: [
-        { name: '123' },
-        { name: '234' },
-        { name: '345' },
-      ]
+      values: [{ name: '123' }, { name: '234' }, { name: '345' }],
     });
 
     const results = await db.getRepository('tests').count({

package/src/__tests__/option-parser.test.ts

@@ -61,7 +61,7 @@ describe('option parser', () => {
   });
 
   test('fields with association', () => {
-    let options: any = {
+    const options: any = {
       fields: ['id', 'name', 'tags.id', 'tags.name'],
     };
 
@@ -83,7 +83,7 @@ describe('option parser', () => {
   });
 
   test('with sort option', () => {
-    if (db.inDialect('mysql'))  {
+    if (db.inDialect('mysql')) {
       expect(1).toBe(1);
       return;
     }

package/src/__tests__/relation-repository/belongs-to-many-repository.test.ts

@@ -157,7 +157,7 @@ describe('belongs to many with target key', function () {
   });
 
   test('destroy with target key and filter', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: {
         name: 't1',
         status: 'published',
@@ -486,7 +486,7 @@ describe('belongs to many', () => {
 
     const PostTagRepository = new BelongsToManyRepository(Post, 'tags', p1.id);
 
-    let t1 = await PostTagRepository.findOne({
+    const t1 = await PostTagRepository.findOne({
       filter: {
         name: 't1',
       },
@@ -571,7 +571,7 @@ describe('belongs to many', () => {
   });
 
   test('add', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: { name: 't1' },
     });
 
@@ -582,7 +582,7 @@ describe('belongs to many', () => {
     const PostTagRepository = new BelongsToManyRepository(Post, 'tags', p1.id);
     await PostTagRepository.add([[t1.id, { tagged_at: '123' }]]);
 
-    let p1Tag = await PostTagRepository.findOne();
+    const p1Tag = await PostTagRepository.findOne();
     expect(p1Tag.posts_tags.tagged_at).toEqual('123');
   });
 
@@ -603,7 +603,7 @@ describe('belongs to many', () => {
 
     await PostTagRepository.set([t1.id]);
 
-    let p1Tags = await PostTagRepository.find();
+    const p1Tags = await PostTagRepository.find();
     expect(p1Tags.length).toEqual(1);
 
     await PostTagRepository.set([[t1.id, { tagged_at: '999' }]]);
@@ -618,7 +618,7 @@ describe('belongs to many', () => {
   });
 
   test('find by pk', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: {
         name: 't1',
       },
@@ -646,7 +646,7 @@ describe('belongs to many', () => {
   });
 
   test('toggle', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: { name: 't1' },
     });
 
@@ -664,7 +664,7 @@ describe('belongs to many', () => {
   });
 
   test('remove', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: { name: 't1' },
     });
 
@@ -682,7 +682,7 @@ describe('belongs to many', () => {
   });
 
   test('destroy all', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: {
         name: 't1',
       },
@@ -709,7 +709,7 @@ describe('belongs to many', () => {
   });
 
   test('destroy by id and filter', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: {
         name: 't1',
         status: 'published',
@@ -746,7 +746,7 @@ describe('belongs to many', () => {
   });
 
   test('destroy with id', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: {
         name: 't1',
       },
@@ -774,7 +774,7 @@ describe('belongs to many', () => {
   });
 
   test('transaction', async () => {
-    let t1 = await Tag.repository.create({
+    const t1 = await Tag.repository.create({
       values: {
         name: 't1',
       },

package/src/__tests__/sequelize-hooks.test.ts

@@ -33,12 +33,7 @@ describe('sequelize-hooks', () => {
     });
     await collection.sync();
     await collection.model.create();
-    expect(orders).toEqual([
-      'model.beforeCreate',
-      'beforeCreate',
-      'model.afterCreate',
-      'afterCreate'
-    ]);
+    expect(orders).toEqual(['model.beforeCreate', 'beforeCreate', 'model.afterCreate', 'afterCreate']);
   });
 
   describe('afterSync', () => {

package/src/__tests__/sort.test.ts

@@ -41,11 +41,11 @@ describe('sort', function () {
       sort: '-num',
     });
     const nums = items.map((item) => item.get('num'));
-    expect(nums).toEqual([3,2,1,null]);
+    expect(nums).toEqual([3, 2, 1, null]);
     const items2 = await Test.repository.find({
       sort: 'num',
     });
     const nums2 = items2.map((item) => item.get('num'));
-    expect(nums2).toEqual([1,2,3,null]);
+    expect(nums2).toEqual([1, 2, 3, null]);
   });
 });

package/src/collection.ts

@@ -24,6 +24,14 @@ type dumpable = 'required' | 'optional' | 'skip';
 export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {
   name: string;
   namespace?: string;
+  /**
+   * Used for @nocobase/plugin-duplicator
+   * @see packages/core/database/src/collection-group-manager.tss
+   *
+   * @prop {'required' | 'optional' | 'skip'} dumpable - Determine whether the collection is dumped
+   * @prop {string[] | string} [with] - Collections dumped with this collection
+   * @prop {any} [delayRestore] - A function to execute after all collections are restored
+   */
   duplicator?:
     | dumpable
     | {
@@ -71,7 +79,7 @@ export class Collection<
   repository: Repository<TModelAttributes, TCreationAttributes>;
 
   get filterTargetKey() {
-    let targetKey = lodash.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
+    const targetKey = lodash.get(this.options, 'filterTargetKey', this.model.primaryKeyAttribute);
     if (!targetKey && this.model.rawAttributes['id']) {
       return 'id';
     }
@@ -285,7 +293,9 @@ export class Collection<
       const [sourceCollectionName, sourceFieldName] = options.source.split('.');
       const sourceCollection = this.db.collections.get(sourceCollectionName);
       if (!sourceCollection) {
-        throw new Error(`source collection "${sourceCollectionName}" not found`);
+        throw new Error(
+          `source collection "${sourceCollectionName}" not found for field "${name}" at collection "${this.name}"`,
+        );
       }
       const sourceField = sourceCollection.fields.get(sourceFieldName);
       options = { ...sourceField.options, ...options };
@@ -472,7 +482,7 @@ export class Collection<
     }
 
     // collection defined indexes
-    let indexes: any = this.model.options.indexes || [];
+    const indexes: any = this.model.options.indexes || [];
 
     let indexName = [];
     let indexItem;

package/src/database.ts

@@ -71,7 +71,7 @@ import { Logger } from '@nocobase/logger';
 import { CollectionGroupManager } from './collection-group-manager';
 import { ViewCollection } from './view-collection';
 
-export interface MergeOptions extends merge.Options {}
+export type MergeOptions = merge.Options;
 
 export interface PendingOptions {
   field: RelationField;
@@ -500,7 +500,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
     }
 
     const [collectionName, associationName, ...args] = path.split('.');
-    let collection = this.getCollection(collectionName);
+    const collection = this.getCollection(collectionName);
 
     if (!collection) {
       return;
@@ -529,7 +529,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
     }
 
     const [collectionName, associationName] = name.split('.');
-    let collection = this.collections.get(collectionName);
+    const collection = this.collections.get(collectionName);
 
     if (associationName) {
       const target = collection.getField(associationName)?.target;

package/src/fields/has-many-field.ts

@@ -5,7 +5,7 @@ import {
   ForeignKeyOptions,
   HasManyOptions,
   HasManyOptions as SequelizeHasManyOptions,
-  Utils
+  Utils,
 } from 'sequelize';
 import { Collection } from '../collection';
 import { Reference } from '../features/ReferencesMap';

package/src/fields/has-one-field.ts

@@ -5,7 +5,7 @@ import {
   ForeignKeyOptions,
   HasOneOptions,
   HasOneOptions as SequelizeHasOneOptions,
-  Utils
+  Utils,
 } from 'sequelize';
 import { Collection } from '../collection';
 import { Reference } from '../features/ReferencesMap';

package/src/fields/index.ts

@@ -13,7 +13,7 @@ import {
   DoubleFieldOptions,
   FloatFieldOptions,
   IntegerFieldOptions,
-  RealFieldOptions
+  RealFieldOptions,
 } from './number-field';
 import { PasswordFieldOptions } from './password-field';
 import { RadioFieldOptions } from './radio-field';

package/src/fields/number-field.ts

@@ -1,9 +1,7 @@
 import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 
-abstract class NumberField extends Field {
-  
-}
+abstract class NumberField extends Field {}
 
 export class IntegerField extends NumberField {
   get dataType() {

package/src/fields/relation-field.ts

@@ -1,6 +1,6 @@
 import { BaseFieldOptions, Field } from './field';
 
-export interface BaseRelationFieldOptions extends BaseFieldOptions {}
+export type BaseRelationFieldOptions = BaseFieldOptions;
 
 export interface MultipleRelationFieldOptions extends BaseRelationFieldOptions {
   sortBy?: string | string[];

package/src/filter-parser.ts

@@ -96,7 +96,7 @@ export default class FilterParser {
       }
 
       debug('handle filter key "%s: "%s"', key, value);
-      let keys = key.split('.');
+      const keys = key.split('.');
 
       // paths ?
       const paths = [];
@@ -236,7 +236,7 @@ export default class FilterParser {
   private getFieldNameFromQueryPath(queryPath: string) {
     const paths = queryPath.split('.');
     let fieldName;
-    let fullPaths = [];
+    const fullPaths = [];
     for (const path of paths) {
       if (path.startsWith('$') || !lodash.isNaN(parseInt(path))) {
         continue;

package/src/model-hook.ts

@@ -15,7 +15,7 @@ export class ModelHook {
     this.database = database;
   }
 
-  match(event: string | Symbol): keyof SequelizeHooks | null {
+  match(event: string | symbol): keyof SequelizeHooks | null {
     // NOTE: skip Symbol event
     if (!lodash.isString(event)) {
       return null;

package/src/operators/empty.ts

@@ -6,7 +6,7 @@ import lodash, { parseInt } from 'lodash';
 const findFilterFieldType = (ctx) => {
   const db = ctx.db;
 
-  let path = ctx.path.split('.');
+  const path = ctx.path.split('.');
 
   // remove operators
   path.pop();

package/src/operators/notIn.ts

@@ -10,4 +10,3 @@ export default {
     };
   },
 } as Record<string, any>;
-

package/src/options-parser.ts

@@ -74,7 +74,7 @@ export class OptionsParser {
     const orderParams = [];
     for (const sortKey of sort) {
       let direction = sortKey.startsWith('-') ? 'DESC' : 'ASC';
-      let sortField: Array<any> = sortKey.replace('-', '').split('.');
+      const sortField: Array<any> = sortKey.replace('-', '').split('.');
 
       if (this.database.inDialect('postgres', 'sqlite')) {
         direction = `${direction} NULLS LAST`;
@@ -192,7 +192,7 @@ export class OptionsParser {
       const association = exceptPath[0];
       const lastLevel = exceptPath.length <= 2;
 
-      let existIncludeIndex = queryParams['include'].findIndex((include) => include['association'] == association);
+      const existIncludeIndex = queryParams['include'].findIndex((include) => include['association'] == association);
 
       if (existIncludeIndex == -1) {
         // if include not exists, ignore this except
@@ -242,7 +242,7 @@ export class OptionsParser {
       //  appends: ['posts']
       //  appends: ['posts.title']
       //  All of these can be seen as last level
-      let lastLevel: boolean = false;
+      let lastLevel = false;
 
       if (appendFields.length == 1) {
         lastLevel = true;

package/src/relation-repository/belongs-to-many-repository.ts

@@ -23,7 +23,7 @@ interface IBelongsToManyRepository<M extends Model> {
   update(options?: UpdateOptions): Promise<M>;
 
   // 删除
-  destroy(options?: number | string | number[] | string[] | DestroyOptions): Promise<Boolean>;
+  destroy(options?: number | string | number[] | string[] | DestroyOptions): Promise<boolean>;
 
   // 建立关联
   set(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
@@ -67,7 +67,7 @@ export class BelongsToManyRepository extends MultipleRelationRepository implemen
       transaction,
     };
   })
-  async destroy(options?: TargetKey | TargetKey[] | DestroyOptions): Promise<Boolean> {
+  async destroy(options?: TargetKey | TargetKey[] | DestroyOptions): Promise<boolean> {
     const transaction = await this.getTransaction(options);
     const association = <BelongsToMany>this.association;
 

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

@@ -2,7 +2,7 @@ import { Model } from '../model';
 import { CreateOptions, UpdateOptions } from '../repository';
 import { SingleRelationFindOption, SingleRelationRepository } from './single-relation-repository';
 
-interface BelongsToFindOptions extends SingleRelationFindOption {}
+type BelongsToFindOptions = SingleRelationFindOption;
 
 interface IBelongsToRepository<M extends Model> {
   // 不需要 findOne，find 就是 findOne
@@ -13,7 +13,7 @@ interface IBelongsToRepository<M extends Model> {
   // 更新
   update(options?: UpdateOptions): Promise<M>;
   // 删除
-  destroy(): Promise<Boolean>;
+  destroy(): Promise<boolean>;
   // 建立关联
   set(primaryKey: any): Promise<void>;
   // 移除关联

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

@@ -22,7 +22,7 @@ interface IHasManyRepository<M extends Model> {
   // 更新
   update(options?: UpdateOptions): Promise<M>;
   // 删除
-  destroy(options?: TK | DestroyOptions): Promise<Boolean>;
+  destroy(options?: TK | DestroyOptions): Promise<boolean>;
   // 建立关联
   set(options: TargetKey | TargetKey[] | AssociatedOptions): Promise<void>;
   // 附加关联
@@ -59,7 +59,7 @@ export class HasManyRepository extends MultipleRelationRepository implements IHa
       transaction,
     };
   })
-  async destroy(options?: TK | DestroyOptions): Promise<Boolean> {
+  async destroy(options?: TK | DestroyOptions): Promise<boolean> {
     const transaction = await this.getTransaction(options);
 
     const sourceModel = await this.getSourceModel(transaction);

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

@@ -11,7 +11,7 @@ interface IHasOneRepository<M extends Model> {
   // 更新
   update(options?): Promise<M>;
   // 删除
-  destroy(): Promise<Boolean>;
+  destroy(): Promise<boolean>;
   // 建立关联
   set(primaryKey: any): Promise<void>;
   // 移除关联

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

@@ -205,7 +205,7 @@ export abstract class MultipleRelationRepository extends RelationRepository {
     return instances;
   }
 
-  async destroy(options?: TK | DestroyOptions): Promise<Boolean> {
+  async destroy(options?: TK | DestroyOptions): Promise<boolean> {
     return false;
   }
 

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

@@ -35,7 +35,7 @@ export abstract class SingleRelationRepository extends RelationRepository {
   })
   async set(options: TargetKey | SetOption): Promise<void> {
     const transaction = await this.getTransaction(options);
-    let handleKey = lodash.isPlainObject(options) ? (<SetOption>options).tk : options;
+    const handleKey = lodash.isPlainObject(options) ? (<SetOption>options).tk : options;
 
     const sourceModel = await this.getSourceModel(transaction);
 
@@ -91,7 +91,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/types.ts

@@ -25,15 +25,24 @@ export type ModelCreateEventTypes = ModelCreateEventType | `${CollectionNameType
 export type ModelUpdateEventTypes = ModelUpdateEventType | `${CollectionNameType}.${ModelUpdateEventType}`;
 export type ModelSaveEventTypes = ModelSaveEventType | `${CollectionNameType}.${ModelSaveEventType}`;
 export type ModelDestroyEventTypes = ModelDestroyEventType | `${CollectionNameType}.${ModelDestroyEventType}`;
-export type ModelCreateWithAssociationsEventTypes = ModelCreateWithAssociationsEventType | `${CollectionNameType}.${ModelCreateWithAssociationsEventType}`;
-export type ModelUpdateWithAssociationsEventTypes = ModelUpdateWithAssociationsEventType | `${CollectionNameType}.${ModelUpdateWithAssociationsEventType}`;
-export type ModelSaveWithAssociationsEventTypes = ModelSaveWithAssociationsEventType | `${CollectionNameType}.${ModelSaveWithAssociationsEventType}`;
+export type ModelCreateWithAssociationsEventTypes =
+  | ModelCreateWithAssociationsEventType
+  | `${CollectionNameType}.${ModelCreateWithAssociationsEventType}`;
+export type ModelUpdateWithAssociationsEventTypes =
+  | ModelUpdateWithAssociationsEventType
+  | `${CollectionNameType}.${ModelUpdateWithAssociationsEventType}`;
+export type ModelSaveWithAssociationsEventTypes =
+  | ModelSaveWithAssociationsEventType
+  | `${CollectionNameType}.${ModelSaveWithAssociationsEventType}`;
 
 export type ModelBulkCreateEvnetTypes = ModelBulkCreateEvnetType | `${CollectionNameType}.${ModelBulkCreateEvnetType}`;
 export type ModelBulkUpdateEvnetTypes = ModelBulkUpdateEvnetType | `${CollectionNameType}.${ModelBulkUpdateEvnetType}`;
-export type ModelBulkDestroyEvnetTypes = ModelBulkDestroyEvnetType | `${CollectionNameType}.${ModelBulkDestroyEvnetType}`;
+export type ModelBulkDestroyEvnetTypes =
+  | ModelBulkDestroyEvnetType
+  | `${CollectionNameType}.${ModelBulkDestroyEvnetType}`;
 
-export type ModelEventTypes = ModelSyncEventType
+export type ModelEventTypes =
+  | ModelSyncEventType
   | ModelValidateEventTypes
   | ModelCreateEventTypes
   | ModelUpdateEventTypes
@@ -51,7 +60,8 @@ export type DatabaseAfterDefineCollectionEventType = 'afterDefineCollection';
 export type DatabaseBeforeRemoveCollectionEventType = 'beforeRemoveCollection';
 export type DatabaseAfterRemoveCollectionEventType = 'afterRemoveCollection';
 
-export type DatabaseEventTypes = DatabaseBeforeDefineCollectionEventType
+export type DatabaseEventTypes =
+  | DatabaseBeforeDefineCollectionEventType
   | DatabaseAfterDefineCollectionEventType
   | DatabaseBeforeRemoveCollectionEventType
   | DatabaseAfterRemoveCollectionEventType;

package/src/update-associations.ts

@@ -309,7 +309,7 @@ export async function updateSingleAssociation(
     }
 
     if (isStringOrNumber(value[dataKey])) {
-      let instance: any = await M.findOne({
+      const instance: any = await M.findOne({
         where: {
           [dataKey]: value[dataKey],
         },

package/src/utils.ts

@@ -156,7 +156,7 @@ export function percent2float(value: string) {
   if (!value.endsWith('%')) {
     return NaN;
   }
-  let val = value.substring(0, value.length - 1);
+  const val = value.substring(0, value.length - 1);
   if (isNaN(+val)) {
     return NaN;
   }