@nocobase/database 0.8.1-alpha.4 → 0.9.0-alpha.2

package/lib/database.d.ts

@@ -68,6 +68,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     tableNameCollectionMap: Map<string, Collection<any, any>>;
     referenceMap: ReferencesMap;
     inheritanceMap: InheritanceMap;
+    importedFrom: Map<string, string[]>;
     modelHook: ModelHook;
     version: DatabaseVersion;
     delayCollectionExtend: Map<string, {
@@ -130,6 +131,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
     extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): void;
     import(options: {
         directory: string;
+        from?: string;
         extensions?: ImportFileExtension[];
     }): Promise<Map<string, Collection>>;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;

package/lib/database.js

@@ -215,6 +215,7 @@ class Database extends _events().EventEmitter {
     this.tableNameCollectionMap = new Map();
     this.referenceMap = new _ReferencesMap.default();
     this.inheritanceMap = new _inheritedMap.default();
+    this.importedFrom = new Map();
     this.modelHook = void 0;
     this.version = void 0;
     this.delayCollectionExtend = new Map();
@@ -296,6 +297,15 @@ class Database extends _events().EventEmitter {
         sequelize: this.sequelize
       }))
     });
+    this.collection({
+      name: 'migrations',
+      autoGenId: false,
+      timestamps: false,
+      fields: [{
+        type: 'string',
+        name: 'name'
+      }]
+    });
     this.sequelize.beforeDefine((model, opts) => {
       if (this.options.tablePrefix) {
         opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
@@ -430,7 +440,25 @@ class Database extends _events().EventEmitter {
 
 
   getCollection(name) {
-    return this.collections.get(name);
+    if (!name) {
+      return null;
+    }
+
+    const _name$split = name.split('.'),
+          _name$split2 = _slicedToArray(_name$split, 2),
+          collectionName = _name$split2[0],
+          associationName = _name$split2[1];
+
+    let 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;
+      return target ? this.collections.get(target) : null;
+    }
+
+    return collection;
   }
 
   hasCollection(name) {
@@ -458,13 +486,13 @@ class Database extends _events().EventEmitter {
   getRepository(name, relationId) {
     var _this$getCollection;
 
-    if (relationId) {
-      var _this$getRepository, _this$getRepository$r;
+    const _name$split3 = name.split('.'),
+          _name$split4 = _slicedToArray(_name$split3, 2),
+          collection = _name$split4[0],
+          relation = _name$split4[1];
 
-      const _name$split = name.split('.'),
-            _name$split2 = _slicedToArray(_name$split, 2),
-            collection = _name$split2[0],
-            relation = _name$split2[1];
+    if (relation) {
+      var _this$getRepository, _this$getRepository$r;
 
       return (_this$getRepository = this.getRepository(collection)) === null || _this$getRepository === void 0 ? void 0 : (_this$getRepository$r = _this$getRepository.relation(relation)) === null || _this$getRepository$r === void 0 ? void 0 : _this$getRepository$r.of(relationId);
     }
@@ -726,6 +754,10 @@ class Database extends _events().EventEmitter {
           } else {
             const collection = _this9.collection(module);
 
+            if (options.from) {
+              _this9.importedFrom.set(options.from, [...(_this9.importedFrom.get(options.from) || []), collection.name]);
+            }
+
             result.set(collection.name, collection);
           }
         }

package/lib/fields/index.d.ts

@@ -11,6 +11,7 @@ import { JsonbFieldOptions, JsonFieldOptions } from './json-field';
 import { DecimalFieldOptions, DoubleFieldOptions, FloatFieldOptions, IntegerFieldOptions, RealFieldOptions } from './number-field';
 import { PasswordFieldOptions } from './password-field';
 import { RadioFieldOptions } from './radio-field';
+import { SetFieldOptions } from './set-field';
 import { SortFieldOptions } from './sort-field';
 import { StringFieldOptions } from './string-field';
 import { TextFieldOptions } from './text-field';
@@ -18,10 +19,7 @@ import { TimeFieldOptions } from './time-field';
 import { UidFieldOptions } from './uid-field';
 import { UUIDFieldOptions } from './uuid-field';
 import { VirtualFieldOptions } from './virtual-field';
-import { FormulaFieldOptions } from './formula-field';
-import { SetFieldOptions } from './set-field';
 export * from './array-field';
-export * from './set-field';
 export * from './belongs-to-field';
 export * from './belongs-to-many-field';
 export * from './boolean-field';
@@ -35,6 +33,7 @@ export * from './number-field';
 export * from './password-field';
 export * from './radio-field';
 export * from './relation-field';
+export * from './set-field';
 export * from './sort-field';
 export * from './string-field';
 export * from './text-field';
@@ -42,5 +41,4 @@ export * from './time-field';
 export * from './uid-field';
 export * from './uuid-field';
 export * from './virtual-field';
-export * from './formula-field';
-export declare type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | FormulaFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions;
+export declare type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions;

package/lib/fields/index.js

@@ -17,19 +17,6 @@ Object.keys(_arrayField).forEach(function (key) {
   });
 });
 
-var _setField = require("./set-field");
-
-Object.keys(_setField).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _setField[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _setField[key];
-    }
-  });
-});
-
 var _belongsToField = require("./belongs-to-field");
 
 Object.keys(_belongsToField).forEach(function (key) {
@@ -199,6 +186,19 @@ Object.keys(_relationField).forEach(function (key) {
   });
 });
 
+var _setField = require("./set-field");
+
+Object.keys(_setField).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _setField[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _setField[key];
+    }
+  });
+});
+
 var _sortField = require("./sort-field");
 
 Object.keys(_sortField).forEach(function (key) {
@@ -288,17 +288,4 @@ Object.keys(_virtualField).forEach(function (key) {
       return _virtualField[key];
     }
   });
-});
-
-var _formulaField = require("./formula-field");
-
-Object.keys(_formulaField).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _formulaField[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _formulaField[key];
-    }
-  });
 });

package/lib/model.js

@@ -173,7 +173,8 @@ class Model extends _sequelize().Model {
 
       if (Object.keys(model.tableAttributes).length === 0) {
         if (_this.database.inDialect('sqlite', 'mysql')) {
-          throw new Error(`Zero-column tables aren't supported in ${_this.database.sequelize.getDialect()}`);
+          console.error(`Zero-column tables aren't supported in ${_this.database.sequelize.getDialect()}`);
+          return;
         } // @ts-ignore
 
 

package/lib/repository.js

@@ -119,6 +119,10 @@ class RelationRepositoryBuilder {
   }
 
   of(id) {
+    if (!this.association) {
+      return;
+    }
+
     const klass = this.builder()[this.association.associationType];
     return new klass(this.collection, this.associationName, id);
   }
@@ -262,9 +266,9 @@ class Repository {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             const row = _step.value;
 
-            const rowCollectionName = _this2.database.tableNameCollectionMap.get(row.get('__tableName')).name;
+            const rowCollectionName = _this2.database.tableNameCollectionMap.get(options.raw ? row['__tableName'] : row.get('__tableName')).name;
 
-            row.set('__collection', rowCollectionName, {
+            options.raw ? row['__collection'] = rowCollectionName : row.set('__collection', rowCollectionName, {
               raw: true
             });
           }

package/package.json

@@ -1,18 +1,12 @@
 {
   "name": "@nocobase/database",
-  "version": "0.8.1-alpha.4",
+  "version": "0.9.0-alpha.2",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
-  "licenses": [
-    {
-      "type": "Apache-2.0",
-      "url": "http://www.apache.org/licenses/LICENSE-2.0"
-    }
-  ],
   "dependencies": {
-    "@nocobase/utils": "0.8.1-alpha.4",
+    "@nocobase/utils": "0.9.0-alpha.2",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
@@ -32,5 +26,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "22ccdf7bd7fcbd16aeefd5250db237a4bd1ccff1"
+  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
 }

package/src/__tests__/collection.test.ts

@@ -19,7 +19,7 @@ describe('collection', () => {
     await db.close();
   });
 
-  it('should throw error when create empty collection in sqlite and mysql', async () => {
+  it('should not throw error when create empty collection in sqlite and mysql', async () => {
     if (!db.inDialect('sqlite', 'mysql')) {
       return;
     }
@@ -44,7 +44,7 @@ describe('collection', () => {
       error = e;
     }
 
-    expect(error.message.includes("Zero-column tables aren't supported in")).toBeTruthy();
+    expect(error).toBeUndefined();
   });
 
   pgOnly()('can create empty collection', async () => {

package/src/database.ts

@@ -15,7 +15,7 @@ import {
   Sequelize,
   SyncOptions,
   Transactionable,
-  Utils,
+  Utils
 } from 'sequelize';
 import { SequelizeStorage, Umzug } from 'umzug';
 import { Collection, CollectionOptions, RepositoryType } from './collection';
@@ -58,7 +58,7 @@ import {
   SyncListener,
   UpdateListener,
   UpdateWithAssociationsListener,
-  ValidateListener,
+  ValidateListener
 } from './types';
 
 export interface MergeOptions extends merge.Options {}
@@ -158,6 +158,8 @@ export class Database extends EventEmitter implements AsyncEmitter {
   referenceMap = new ReferencesMap();
   inheritanceMap = new InheritanceMap();
 
+  importedFrom = new Map<string, Array<string>>();
+
   modelHook: ModelHook;
   version: DatabaseVersion;
 
@@ -232,6 +234,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
     };
 
     this.migrations = new Migrations(context);
+
     this.migrator = new Umzug({
       logger: migratorOptions.logger || console,
       migrations: this.migrations.callback(),
@@ -243,6 +246,13 @@ export class Database extends EventEmitter implements AsyncEmitter {
       }),
     });
 
+    this.collection({
+      name: 'migrations',
+      autoGenId: false,
+      timestamps: false,
+      fields: [{ type: 'string', name: 'name' }],
+    });
+
     this.sequelize.beforeDefine((model, opts) => {
       if (this.options.tablePrefix) {
         opts.tableName = `${this.options.tablePrefix}${opts.tableName || opts.modelName || opts.name.plural}`;
@@ -346,7 +356,19 @@ export class Database extends EventEmitter implements AsyncEmitter {
    * @param name
    */
   getCollection(name: string): Collection {
-    return this.collections.get(name);
+    if (!name) {
+      return null;
+    }
+
+    const [collectionName, associationName] = name.split('.');
+    let collection = this.collections.get(collectionName);
+
+    if (associationName) {
+      const target = collection.getField(associationName)?.target;
+      return target ? this.collections.get(target) : null;
+    }
+
+    return collection;
   }
 
   hasCollection(name: string): boolean {
@@ -379,11 +401,10 @@ export class Database extends EventEmitter implements AsyncEmitter {
   getRepository<R extends ArrayFieldRepository>(name: string, relationId: string | number): R;
 
   getRepository<R extends RelationRepository>(name: string, relationId?: string | number): Repository | R {
-    if (relationId) {
-      const [collection, relation] = name.split('.');
+    const [collection, relation] = name.split('.');
+    if (relation) {
       return this.getRepository(collection)?.relation(relation)?.of(relationId) as R;
     }
-
     return this.getCollection(name)?.repository;
   }
 
@@ -447,6 +468,7 @@ export class Database extends EventEmitter implements AsyncEmitter {
 
   buildField(options, context: FieldContext) {
     const { type } = options;
+
     const Field = this.fieldTypes.get(type);
 
     if (!Field) {
@@ -578,7 +600,11 @@ export class Database extends EventEmitter implements AsyncEmitter {
     }
   }
 
-  async import(options: { directory: string; extensions?: ImportFileExtension[] }): Promise<Map<string, Collection>> {
+  async import(options: {
+    directory: string;
+    from?: string;
+    extensions?: ImportFileExtension[];
+  }): Promise<Map<string, Collection>> {
     const reader = new ImporterReader(options.directory, options.extensions);
     const modules = await reader.read();
     const result = new Map<string, Collection>();
@@ -588,6 +614,11 @@ export class Database extends EventEmitter implements AsyncEmitter {
         this.extendCollection(module.collectionOptions, module.mergeOptions);
       } else {
         const collection = this.collection(module);
+
+        if (options.from) {
+          this.importedFrom.set(options.from, [...(this.importedFrom.get(options.from) || []), collection.name]);
+        }
+
         result.set(collection.name, collection);
       }
     }

package/src/fields/field.ts

@@ -6,12 +6,12 @@ import {
   ModelIndexesOptions,
   QueryInterfaceOptions,
   SyncOptions,
-  Transactionable,
+  Transactionable
 } from 'sequelize';
 import { Collection } from '../collection';
 import { Database } from '../database';
-import { ModelEventTypes } from '../types';
 import { InheritedCollection } from '../inherited-collection';
+import { ModelEventTypes } from '../types';
 
 export interface FieldContext {
   database: Database;

package/src/fields/index.ts

@@ -13,10 +13,11 @@ import {
   DoubleFieldOptions,
   FloatFieldOptions,
   IntegerFieldOptions,
-  RealFieldOptions,
+  RealFieldOptions
 } from './number-field';
 import { PasswordFieldOptions } from './password-field';
 import { RadioFieldOptions } from './radio-field';
+import { SetFieldOptions } from './set-field';
 import { SortFieldOptions } from './sort-field';
 import { StringFieldOptions } from './string-field';
 import { TextFieldOptions } from './text-field';
@@ -24,11 +25,8 @@ import { TimeFieldOptions } from './time-field';
 import { UidFieldOptions } from './uid-field';
 import { UUIDFieldOptions } from './uuid-field';
 import { VirtualFieldOptions } from './virtual-field';
-import { FormulaFieldOptions } from './formula-field';
-import { SetFieldOptions } from './set-field';
 
 export * from './array-field';
-export * from './set-field';
 export * from './belongs-to-field';
 export * from './belongs-to-many-field';
 export * from './boolean-field';
@@ -42,6 +40,7 @@ export * from './number-field';
 export * from './password-field';
 export * from './radio-field';
 export * from './relation-field';
+export * from './set-field';
 export * from './sort-field';
 export * from './string-field';
 export * from './text-field';
@@ -49,7 +48,6 @@ export * from './time-field';
 export * from './uid-field';
 export * from './uuid-field';
 export * from './virtual-field';
-export * from './formula-field';
 
 export type FieldOptions =
   | BaseFieldOptions
@@ -66,7 +64,6 @@ export type FieldOptions =
   | SortFieldOptions
   | TextFieldOptions
   | VirtualFieldOptions
-  | FormulaFieldOptions
   | ArrayFieldOptions
   | SetFieldOptions
   | TimeFieldOptions

package/src/model.ts

@@ -156,7 +156,8 @@ export class Model<TModelAttributes extends {} = any, TCreationAttributes extend
     // fix sequelize sync with model that not have any column
     if (Object.keys(model.tableAttributes).length === 0) {
       if (this.database.inDialect('sqlite', 'mysql')) {
-        throw new Error(`Zero-column tables aren't supported in ${this.database.sequelize.getDialect()}`);
+        console.error(`Zero-column tables aren't supported in ${this.database.sequelize.getDialect()}`);
+        return;
       }
 
       // @ts-ignore

package/src/repository.ts

@@ -11,7 +11,7 @@ import {
   Op,
   Transactionable,
   UpdateOptions as SequelizeUpdateOptions,
-  WhereOperators,
+  WhereOperators
 } from 'sequelize';
 import { Collection } from './collection';
 import { Database } from './database';
@@ -193,6 +193,9 @@ class RelationRepositoryBuilder<R extends RelationRepository> {
   }
 
   of(id: string | number): R {
+    if (!this.association) {
+      return;
+    }
     const klass = this.builder()[this.association.associationType];
     return new klass(this.collection, this.associationName, id);
   }
@@ -335,10 +338,15 @@ export class Repository<TModelAttributes extends {} = any, TCreationAttributes e
 
     if (this.collection.isParent()) {
       for (const row of rows) {
-        const rowCollectionName = this.database.tableNameCollectionMap.get(row.get('__tableName')).name;
-        row.set('__collection', rowCollectionName, {
-          raw: true,
-        });
+        const rowCollectionName = this.database.tableNameCollectionMap.get(
+          options.raw ? row['__tableName'] : row.get('__tableName'),
+        ).name;
+
+        options.raw
+          ? (row['__collection'] = rowCollectionName)
+          : row.set('__collection', rowCollectionName, {
+              raw: true,
+            });
       }
     }
 

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

@@ -1,19 +0,0 @@
-import { DataTypes } from 'sequelize';
-import { BaseColumnFieldOptions, Field } from './field';
-export declare class FormulaField extends Field {
-    get dataType(): DataTypes.FloatDataTypeConstructor;
-    caculate(expression: any, scope: any): any;
-    initFieldData: ({ transaction }: {
-        transaction: any;
-    }) => Promise<void>;
-    caculateField: (instance: any) => Promise<void>;
-    updateFieldData: (instance: any, { transaction }: {
-        transaction: any;
-    }) => Promise<void>;
-    bind(): void;
-    unbind(): void;
-}
-export interface FormulaFieldOptions extends BaseColumnFieldOptions {
-    type: 'formula';
-    expression: string;
-}

package/lib/fields/formula-field.js

@@ -1,197 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FormulaField = void 0;
-
-function _sequelize() {
-  const data = require("sequelize");
-
-  _sequelize = function _sequelize() {
-    return data;
-  };
-
-  return data;
-}
-
-var _field = require("./field");
-
-function math() {
-  const data = _interopRequireWildcard(require("mathjs"));
-
-  math = function math() {
-    return data;
-  };
-
-  return data;
-}
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-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; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-class FormulaField extends _field.Field {
-  constructor(...args) {
-    var _this;
-
-    super(...args);
-    _this = this;
-
-    this.initFieldData = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* ({
-        transaction
-      }) {
-        const _this$options = _this.options,
-              expression = _this$options.expression,
-              name = _this$options.name;
-        const records = yield _this.collection.repository.find({
-          order: [_this.collection.model.primaryKeyAttribute],
-          transaction
-        });
-
-        var _iterator = _createForOfIteratorHelper(records),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            const record = _step.value;
-            const scope = record.toJSON();
-
-            const result = _this.caculate(expression, scope);
-
-            if (result) {
-              yield record.update({
-                [name]: result
-              }, {
-                transaction,
-                silent: true,
-                hooks: false
-              });
-            }
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      });
-
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-
-    this.caculateField = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (instance) {
-        const _this$options2 = _this.options,
-              expression = _this$options2.expression,
-              name = _this$options2.name;
-        const scope = instance.toJSON();
-        let result;
-
-        try {
-          result = math().evaluate(expression, scope);
-          result = math().round(result, 9);
-        } catch (_unused) {}
-
-        if (result === 0 || result) {
-          instance.set(name, result);
-        }
-      });
-
-      return function (_x2) {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-
-    this.updateFieldData = /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator(function* (instance, {
-        transaction
-      }) {
-        if (_this.collection.name === instance.collectionName && instance.name === _this.options.name) {
-          _this.options = Object.assign(_this.options, instance.options);
-          const _this$options3 = _this.options,
-                name = _this$options3.name,
-                expression = _this$options3.expression;
-          const records = yield _this.collection.repository.find({
-            order: [_this.collection.model.primaryKeyAttribute],
-            transaction
-          });
-
-          var _iterator2 = _createForOfIteratorHelper(records),
-              _step2;
-
-          try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              const record = _step2.value;
-              const scope = record.toJSON();
-
-              const result = _this.caculate(expression, scope);
-
-              yield record.update({
-                [name]: result
-              }, {
-                transaction,
-                silent: true,
-                hooks: false
-              });
-            }
-          } catch (err) {
-            _iterator2.e(err);
-          } finally {
-            _iterator2.f();
-          }
-        }
-      });
-
-      return function (_x3, _x4) {
-        return _ref3.apply(this, arguments);
-      };
-    }();
-  }
-
-  get dataType() {
-    return _sequelize().DataTypes.FLOAT;
-  }
-
-  caculate(expression, scope) {
-    let result = null;
-
-    try {
-      result = math().evaluate(expression, scope);
-      result = math().round(result, 9);
-    } catch (_unused2) {}
-
-    return result;
-  }
-
-  bind() {
-    super.bind();
-    this.on('afterSync', this.initFieldData); // TODO: should not depends on fields table (which is defined by other plugin)
-
-    this.database.on('fields.afterUpdate', this.updateFieldData);
-    this.on('beforeSave', this.caculateField);
-  }
-
-  unbind() {
-    super.unbind();
-    this.off('beforeSave', this.caculateField); // TODO: should not depends on fields table
-
-    this.database.off('fields.afterUpdate', this.updateFieldData);
-    this.off('afterSync', this.initFieldData);
-  }
-
-}
-
-exports.FormulaField = FormulaField;

package/src/__tests__/fields/formula-field.test.ts

@@ -1,69 +0,0 @@
-import { mockDatabase } from '..';
-import { Database } from '../../database';
-import { FormulaField } from '../../fields';
-
-describe('formula field', () => {
-  let db: Database;
-
-  beforeEach(async () => {
-    db = mockDatabase();
-  });
-
-  afterEach(async () => {
-    await db.close();
-  });
-
-  it('add formula field with old table, already has data.', async () => {
-    const Test = db.collection({
-      name: 'tests',
-      fields: [
-        { type: 'float', name: 'price' },
-        { type: 'float', name: 'count' },
-      ],
-    });
-
-    await db.sync();
-
-    const test = await Test.model.create<any>({
-      price: '1.2',
-      count: '2',
-    });
-
-    const expression = 'price*count';
-    const field = Test.addField('sum', { type: 'formula', expression });
-
-    await field.sync({});
-
-    const updatedTest = await Test.model.findByPk(test.id);
-    const sum = updatedTest.get('sum');
-
-    const sumField = Test.getField<FormulaField>('sum');
-    expect(sum).toEqual(sumField.caculate(expression, updatedTest.toJSON()));
-  });
-
-  it('auto set formula field with create or update data', async () => {
-    const expression = 'price*count';
-    const Test = db.collection({
-      name: 'tests',
-      fields: [
-        { type: 'float', name: 'price' },
-        { type: 'float', name: 'count' },
-        { name: 'sum', type: 'formula', expression },
-      ],
-    });
-
-    await db.sync();
-
-    const test = await Test.model.create<any>({
-      price: '1.2',
-      count: '2',
-    });
-
-    const sumField = Test.getField<FormulaField>('sum');
-    expect(test.get('sum')).toEqual(sumField.caculate(expression, test.toJSON()));
-
-    test.set('count', '6');
-    await test.save();
-    expect(test.get('sum')).toEqual(sumField.caculate(expression, test.toJSON()));
-  });
-});

package/src/fields/formula-field.ts

@@ -1,106 +0,0 @@
-import { DataTypes } from 'sequelize';
-import { BaseColumnFieldOptions, Field } from './field';
-import * as math from 'mathjs';
-
-export class FormulaField extends Field {
-  get dataType() {
-    return DataTypes.FLOAT;
-  }
-
-  caculate(expression, scope) {
-    let result = null;
-    try {
-      result = math.evaluate(expression, scope);
-      result = math.round(result, 9);
-    } catch {}
-    return result;
-  }
-
-  initFieldData = async ({ transaction }) => {
-    const { expression, name } = this.options;
-
-    const records = await this.collection.repository.find({
-      order: [this.collection.model.primaryKeyAttribute],
-      transaction,
-    });
-
-    for (const record of records) {
-      const scope = record.toJSON();
-      const result = this.caculate(expression, scope);
-      if (result) {
-        await record.update(
-          {
-            [name]: result,
-          },
-          {
-            transaction,
-            silent: true,
-            hooks: false,
-          },
-        );
-      }
-    }
-  };
-
-  caculateField = async (instance) => {
-    const { expression, name } = this.options;
-    const scope = instance.toJSON();
-    let result;
-    try {
-      result = math.evaluate(expression, scope);
-      result = math.round(result, 9);
-    } catch {}
-    if (result === 0 || result) {
-      instance.set(name, result);
-    }
-  };
-
-  updateFieldData = async (instance, { transaction }) => {
-    if (this.collection.name === instance.collectionName && instance.name === this.options.name) {
-      this.options = Object.assign(this.options, instance.options);
-      const { name, expression } = this.options;
-
-      const records = await this.collection.repository.find({
-        order: [this.collection.model.primaryKeyAttribute],
-        transaction,
-      });
-
-      for (const record of records) {
-        const scope = record.toJSON();
-        const result = this.caculate(expression, scope);
-        await record.update(
-          {
-            [name]: result,
-          },
-          {
-            transaction,
-            silent: true,
-            hooks: false,
-          },
-        );
-      }
-    }
-  };
-
-  bind() {
-    super.bind();
-    this.on('afterSync', this.initFieldData);
-    // TODO: should not depends on fields table (which is defined by other plugin)
-    this.database.on('fields.afterUpdate', this.updateFieldData);
-    this.on('beforeSave', this.caculateField);
-  }
-
-  unbind() {
-    super.unbind();
-    this.off('beforeSave', this.caculateField);
-    // TODO: should not depends on fields table
-    this.database.off('fields.afterUpdate', this.updateFieldData);
-    this.off('afterSync', this.initFieldData);
-  }
-}
-
-export interface FormulaFieldOptions extends BaseColumnFieldOptions {
-  type: 'formula';
-
-  expression: string;
-}