@nocobase/database 0.7.4-alpha.4 → 0.7.5-alpha.1

package/lib/collection.d.ts

@@ -42,6 +42,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     get name(): string;
     get db(): Database;
     constructor(options: CollectionOptions, context?: CollectionContext);
+    private checkOptions;
     private sequelizeModelOptions;
     /**
      * TODO
@@ -60,7 +61,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     remove(): void;
     removeFromDb(options?: QueryInterfaceDropTableOptions): Promise<void>;
     existsInDb(options?: Transactionable): Promise<boolean>;
-    removeField(name: any): Field;
+    removeField(name: string): void | Field;
     /**
      * TODO
      */
@@ -73,7 +74,11 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
      * @param options
      */
     updateField(name: string, options: FieldOptions): void;
-    addIndex(index: any): void;
+    addIndex(index: string | string[] | {
+        fields: string[];
+        unique?: boolean;
+        [key: string]: any;
+    }): void;
     removeIndex(fields: any): void;
     sync(syncOptions?: SyncOptions): Promise<void>;
 }

package/lib/collection.js

@@ -49,6 +49,8 @@ var _model = require("./model");
 
 var _repository = require("./repository");
 
+var _utils = require("./utils");
+
 const _excluded = ["name"],
       _excluded2 = ["name"];
 
@@ -95,6 +97,7 @@ class Collection extends _events().EventEmitter {
     this.fields = new Map();
     this.model = void 0;
     this.repository = void 0;
+    this.checkOptions(options);
     this.context = context;
     this.options = options;
     this.bindFieldEventListener();
@@ -104,6 +107,10 @@ class Collection extends _events().EventEmitter {
     this.setSortable(options.sortable);
   }
 
+  checkOptions(options) {
+    (0, _utils.checkIdentifier)(options.name);
+  }
+
   sequelizeModelOptions() {
     const _this$options = this.options,
           name = _this$options.name,
@@ -176,9 +183,7 @@ class Collection extends _events().EventEmitter {
   }
 
   bindFieldEventListener() {
-    this.on('field.afterAdd', field => {
-      field.bind();
-    });
+    this.on('field.afterAdd', field => field.bind());
     this.on('field.afterRemove', field => field.unbind());
   }
 
@@ -203,6 +208,7 @@ class Collection extends _events().EventEmitter {
   }
 
   setField(name, options) {
+    (0, _utils.checkIdentifier)(name);
     const database = this.context.database;
     const field = database.buildField(_objectSpread({
       name
@@ -432,7 +438,13 @@ class Collection extends _events().EventEmitter {
     const tableName = this.model.getTableName(); // @ts-ignore
 
     this.model._indexes = this.model.options.indexes // @ts-ignore
-    .map(index => _sequelize().Utils.nameIndex(this.model._conformIndex(index), tableName));
+    .map(index => _sequelize().Utils.nameIndex(this.model._conformIndex(index), tableName)).map(item => {
+      if (item.name && item.name.length > 63) {
+        item.name = 'i_' + (0, _utils.md5)(item.name);
+      }
+
+      return item;
+    });
   }
 
   removeIndex(fields) {
@@ -452,22 +464,22 @@ class Collection extends _events().EventEmitter {
     var _this3 = this;
 
     return _asyncToGenerator(function* () {
-      const modelNames = [_this3.model.name];
+      const modelNames = new Set([_this3.model.name]);
       const associations = _this3.model.associations;
 
       for (const associationKey in associations) {
         const association = associations[associationKey];
-        modelNames.push(association.target.name);
+        modelNames.add(association.target.name);
 
         if (association.through) {
-          modelNames.push(association.through.model.name);
+          modelNames.add(association.through.model.name);
         }
       }
 
       const models = []; // @ts-ignore
 
       _this3.context.database.sequelize.modelManager.forEachModel(model => {
-        if (modelNames.includes(model.name)) {
+        if (modelNames.has(model.name)) {
           models.push(model);
         }
       });

package/lib/database.d.ts

@@ -8,7 +8,7 @@ import { Collection, CollectionOptions, RepositoryType } from './collection';
 import { ImportFileExtension } from './collection-importer';
 import * as FieldTypes from './fields';
 import { Field, FieldContext, RelationField } from './fields';
-import { Migrations } from './migration';
+import { MigrationItem, Migrations } from './migration';
 import { Model } from './model';
 import { ModelHook } from './model-hook';
 import { RelationRepository } from './relation-repository/relation-repository';
@@ -67,7 +67,7 @@ export declare class Database extends EventEmitter implements AsyncEmitter {
         mergeOptions?: any;
     }[]>;
     constructor(options: DatabaseOptions);
-    addMigration(item: any): void;
+    addMigration(item: MigrationItem): void;
     addMigrations(options: AddMigrationsOptions): void;
     inDialect(...dialect: string[]): boolean;
     private requireModule;

package/lib/database.js

@@ -152,14 +152,16 @@ class DatabaseVersion {
         },
         mysql: {
           sql: 'select version() as version',
-          get: v => v
+          get: v => {
+            const m = /([\d+\.]+)/.exec(v);
+            return m[0];
+          }
         },
         postgres: {
           sql: 'select version() as version',
           get: v => {
-            const keys = v.split(/\s|,/);
-            keys.shift();
-            return _semver().default.minVersion(keys.shift()).version;
+            const m = /([\d+\.]+)/.exec(v);
+            return _semver().default.minVersion(m[0]).version;
           }
         }
       };

package/lib/decorators/must-have-filter-decorator.d.ts

@@ -0,0 +1,2 @@
+declare const mustHaveFilter: () => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
+export default mustHaveFilter;

package/lib/decorators/must-have-filter-decorator.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+const mustHaveFilter = () => (target, propertyKey, descriptor) => {
+  const oldValue = descriptor.value;
+
+  descriptor.value = function () {
+    const options = arguments[0];
+
+    if (!(options === null || options === void 0 ? void 0 : options.filter) && !(options === null || options === void 0 ? void 0 : options.filterByTk) && !(options === null || options === void 0 ? void 0 : options.forceUpdate)) {
+      throw new Error(`must provide filter or filterByTk for ${propertyKey} call, or set forceUpdate to true`);
+    }
+
+    return oldValue.apply(this, arguments);
+  };
+
+  return descriptor;
+};
+
+var _default = mustHaveFilter;
+exports.default = _default;

package/lib/{transaction-decorator.js → decorators/transaction-decorator.js}

@@ -63,13 +63,10 @@ function transactionWrapperBuilder(transactionGenerator) {
               throw new Error(`please provide transactionInjector for ${name} call`);
             }
 
-            const results = yield oldValue.apply(this, [callArguments]);
+            const results = yield oldValue.call(this, callArguments);
             yield transaction.commit();
             return results;
           } catch (err) {
-            console.error({
-              err
-            });
             yield transaction.rollback();
             throw err;
           }

package/lib/errors/identifier-error.d.ts

@@ -0,0 +1,3 @@
+export declare class IdentifierError extends Error {
+    constructor(message: string);
+}

package/lib/errors/identifier-error.js

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.IdentifierError = void 0;
+
+class IdentifierError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'IdentifierError';
+  }
+
+}
+
+exports.IdentifierError = IdentifierError;

package/lib/fields/belongs-to-field.js

@@ -25,6 +25,8 @@ function _sequelize() {
   return data;
 }
 
+var _utils = require("../utils");
+
 var _relationField = require("./relation-field");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -71,6 +73,13 @@ class BelongsToField extends _relationField.RelationField {
       this.options.foreignKey = association.foreignKey;
     }
 
+    try {
+      (0, _utils.checkIdentifier)(this.options.foreignKey);
+    } catch (error) {
+      this.unbind();
+      throw error;
+    }
+
     if (!this.options.sourceKey) {
       // @ts-ignore
       this.options.sourceKey = association.sourceKey;

package/lib/fields/belongs-to-many-field.js

@@ -25,6 +25,8 @@ function _sequelize() {
   return data;
 }
 
+var _utils = require("../utils");
+
 var _relationField = require("./relation-field");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -84,6 +86,14 @@ class BelongsToManyField extends _relationField.RelationField {
       this.options.otherKey = association.otherKey;
     }
 
+    try {
+      (0, _utils.checkIdentifier)(this.options.foreignKey);
+      (0, _utils.checkIdentifier)(this.options.otherKey);
+    } catch (error) {
+      this.unbind();
+      throw error;
+    }
+
     if (!this.options.through) {
       this.options.through = this.through;
     }

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

@@ -1,7 +1,7 @@
 import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class DateField extends Field {
-    get dataType(): DataTypes.DateDataTypeConstructor;
+    get dataType(): DataTypes.DateDataType;
 }
 export interface DateFieldOptions extends BaseColumnFieldOptions {
     type: 'date';

package/lib/fields/date-field.js

@@ -19,7 +19,7 @@ var _field = require("./field");
 
 class DateField extends _field.Field {
   get dataType() {
-    return _sequelize().DataTypes.DATE;
+    return _sequelize().DataTypes.DATE(3);
   }
 
 }

package/lib/fields/field.d.ts

@@ -29,7 +29,7 @@ export declare abstract class Field {
     on(eventName: string, listener: (...args: any[]) => void): this;
     off(eventName: string, listener: (...args: any[]) => void): this;
     get(name: string): any;
-    remove(): Field;
+    remove(): void | Field;
     removeFromDb(options?: QueryInterfaceOptions): Promise<void>;
     existsInDb(options?: Transactionable): Promise<boolean>;
     merge(obj: any): void;

package/lib/fields/field.js

@@ -62,8 +62,7 @@ class Field {
     this.collection = context.collection;
     this.options = options || {};
     this.init();
-  } // TODO
-
+  }
 
   sync(syncOptions) {
     var _this = this;
@@ -219,7 +218,7 @@ class Field {
     const model = this.context.collection.model;
     model.removeAttribute(this.name);
 
-    if (this.options.index) {
+    if (this.options.index || this.options.unique) {
       this.context.collection.removeIndex([this.name]);
     }
   }

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

@@ -3,13 +3,13 @@ import { BaseColumnFieldOptions, Field } from './field';
 export declare class FormulaField extends Field {
     get dataType(): DataTypes.FloatDataTypeConstructor;
     caculate(expression: any, scope: any): any;
-    initFieldData({ transaction }: {
+    initFieldData: ({ transaction }: {
         transaction: any;
-    }): Promise<void>;
-    caculateField(instance: any): Promise<void>;
-    updateFieldData(instance: any, { transaction }: {
+    }) => Promise<void>;
+    caculateField: (instance: any) => Promise<void>;
+    updateFieldData: (instance: any, { transaction }: {
         transaction: any;
-    }): Promise<void>;
+    }) => Promise<void>;
     bind(): void;
     unbind(): void;
 }

package/lib/fields/formula-field.js

@@ -42,141 +42,154 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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 {
-  get dataType() {
-    return _sequelize().DataTypes.FLOAT;
-  }
+  constructor(...args) {
+    var _this;
 
-  caculate(expression, scope) {
-    let result = null;
+    super(...args);
+    _this = this;
 
-    try {
-      result = math().evaluate(expression, scope);
-      result = math().round(result, 9);
-    } catch (_unused) {}
+    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
+        });
 
-    return result;
-  }
+        var _iterator = _createForOfIteratorHelper(records),
+            _step;
 
-  initFieldData({
-    transaction
-  }) {
-    var _this = this;
-
-    return _asyncToGenerator(function* () {
-      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
+        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();
+        }
       });
 
-      var _iterator = _createForOfIteratorHelper(records),
-          _step;
+      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 {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          const record = _step.value;
-          const scope = record.toJSON();
+        try {
+          result = math().evaluate(expression, scope);
+          result = math().round(result, 9);
+        } catch (_unused) {}
 
-          const result = _this.caculate(expression, scope);
+        if (result) {
+          instance.set(name, result);
+        }
+      });
 
-          if (result) {
-            yield record.update({
-              [name]: result
-            }, {
-              transaction,
-              silent: true,
-              hooks: false
-            });
+      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();
           }
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-    })();
-  }
+      });
 
-  caculateField(instance) {
-    var _this2 = this;
-
-    return _asyncToGenerator(function* () {
-      const _this2$options = _this2.options,
-            expression = _this2$options.expression,
-            name = _this2$options.name;
-      const scope = instance.toJSON();
-      let result;
-
-      try {
-        result = math().evaluate(expression, scope);
-        result = math().round(result, 9);
-      } catch (_unused2) {}
-
-      if (result) {
-        instance.set(name, result);
-      }
-    })();
+      return function (_x3, _x4) {
+        return _ref3.apply(this, arguments);
+      };
+    }();
   }
 
-  updateFieldData(instance, {
-    transaction
-  }) {
-    var _this3 = this;
-
-    return _asyncToGenerator(function* () {
-      if (_this3.collection.name === instance.collectionName && instance.name === _this3.options.name) {
-        _this3.options = Object.assign(_this3.options, instance.options);
-        const _this3$options = _this3.options,
-              name = _this3$options.name,
-              expression = _this3$options.expression;
-        const records = yield _this3.collection.repository.find({
-          order: [_this3.collection.model.primaryKeyAttribute],
-          transaction
-        });
-
-        var _iterator2 = _createForOfIteratorHelper(records),
-            _step2;
+  get dataType() {
+    return _sequelize().DataTypes.FLOAT;
+  }
 
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            const record = _step2.value;
-            const scope = record.toJSON();
+  caculate(expression, scope) {
+    let result = null;
 
-            const result = _this3.caculate(expression, scope);
+    try {
+      result = math().evaluate(expression, scope);
+      result = math().round(result, 9);
+    } catch (_unused2) {}
 
-            yield record.update({
-              [name]: result
-            }, {
-              transaction,
-              silent: true,
-              hooks: false
-            });
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-      }
-    })();
+    return result;
   }
 
   bind() {
     super.bind();
-    this.on('afterSync', this.initFieldData.bind(this));
-    this.database.on('fields.afterUpdate', this.updateFieldData.bind(this));
-    this.on('beforeCreate', this.caculateField.bind(this));
-    this.on('beforeUpdate', this.caculateField.bind(this));
+    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('beforeCreate', this.caculateField.bind(this));
-    this.off('beforeUpdate', this.caculateField.bind(this));
-    this.database.off('fields.afterUpdate', this.updateFieldData.bind(this));
-    this.off('afterSync', this.initFieldData.bind(this));
+    this.off('beforeSave', this.caculateField); // TODO: should not depends on fields table
+
+    this.database.off('fields.afterUpdate', this.updateFieldData);
+    this.off('afterSync', this.initFieldData);
   }
 
 }

package/lib/fields/has-many-field.js

@@ -25,6 +25,8 @@ function _sequelize() {
   return data;
 }
 
+var _utils = require("../utils");
+
 var _relationField = require("./relation-field");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -73,6 +75,13 @@ class HasManyField extends _relationField.RelationField {
       this.options.foreignKey = association.foreignKey;
     }
 
+    try {
+      (0, _utils.checkIdentifier)(this.options.foreignKey);
+    } catch (error) {
+      this.unbind();
+      throw error;
+    }
+
     if (!this.options.sourceKey) {
       // @ts-ignore
       this.options.sourceKey = association.sourceKey;

package/lib/fields/has-one-field.js

@@ -25,6 +25,8 @@ function _sequelize() {
   return data;
 }
 
+var _utils = require("../utils");
+
 var _relationField = require("./relation-field");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -74,6 +76,13 @@ class HasOneField extends _relationField.RelationField {
       this.options.foreignKey = association.foreignKey;
     }
 
+    try {
+      (0, _utils.checkIdentifier)(this.options.foreignKey);
+    } catch (error) {
+      this.unbind();
+      throw error;
+    }
+
     if (!this.options.sourceKey) {
       // @ts-ignore
       this.options.sourceKey = association.sourceKey;