@nocobase/database 0.9.1-alpha.1 → 0.9.2-alpha.1

package/lib/fields/password-field.js

@@ -4,55 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PasswordField = void 0;
-
 function _crypto() {
   const data = _interopRequireDefault(require("crypto"));
-
   _crypto = function _crypto() {
     return data;
   };
-
   return data;
 }
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _field = require("./field");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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 PasswordField extends _field.Field {
   get dataType() {
     return _sequelize().DataTypes.STRING;
   }
-
   verify(password, hash) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       password = password || '';
       hash = hash || '';
       const _this$options = _this.options,
-            _this$options$length = _this$options.length,
-            length = _this$options$length === void 0 ? 64 : _this$options$length,
-            _this$options$randomB = _this$options.randomBytesSize,
-            randomBytesSize = _this$options$randomB === void 0 ? 8 : _this$options$randomB;
+        _this$options$length = _this$options.length,
+        length = _this$options$length === void 0 ? 64 : _this$options$length,
+        _this$options$randomB = _this$options.randomBytesSize,
+        randomBytesSize = _this$options$randomB === void 0 ? 8 : _this$options$randomB;
       return new Promise((resolve, reject) => {
         const salt = hash.substring(0, randomBytesSize * 2);
         const key = hash.substring(randomBytesSize * 2);
-
         _crypto().default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
           if (err) reject(err);
           resolve(key == derivedKey.toString('hex'));
@@ -60,19 +46,16 @@ class PasswordField extends _field.Field {
       });
     })();
   }
-
   hash(password) {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       const _this2$options = _this2.options,
-            _this2$options$length = _this2$options.length,
-            length = _this2$options$length === void 0 ? 64 : _this2$options$length,
-            _this2$options$random = _this2$options.randomBytesSize,
-            randomBytesSize = _this2$options$random === void 0 ? 8 : _this2$options$random;
+        _this2$options$length = _this2$options.length,
+        length = _this2$options$length === void 0 ? 64 : _this2$options$length,
+        _this2$options$random = _this2$options.randomBytesSize,
+        randomBytesSize = _this2$options$random === void 0 ? 8 : _this2$options$random;
       return new Promise((resolve, reject) => {
         const salt = _crypto().default.randomBytes(randomBytesSize).toString('hex');
-
         _crypto().default.scrypt(password, salt, length / 2 - randomBytesSize, (err, derivedKey) => {
           if (err) reject(err);
           resolve(salt + derivedKey.toString('hex'));
@@ -80,20 +63,15 @@ class PasswordField extends _field.Field {
       });
     })();
   }
-
   init() {
     var _this3 = this;
-
     const name = this.options.name;
-
     this.listener = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (model) {
         if (!model.changed(name)) {
           return;
         }
-
         const value = model.get(name);
-
         if (value) {
           const hash = yield _this3.hash(value);
           model.set(name, hash);
@@ -101,25 +79,20 @@ class PasswordField extends _field.Field {
           model.set(name, null);
         }
       });
-
       return function (_x) {
         return _ref.apply(this, arguments);
       };
     }();
   }
-
   bind() {
     super.bind();
     this.on('beforeCreate', this.listener);
     this.on('beforeUpdate', this.listener);
   }
-
   unbind() {
     super.unbind();
     this.off('beforeCreate', this.listener);
     this.off('beforeUpdate', this.listener);
   }
-
 }
-
 exports.PasswordField = PasswordField;

package/lib/fields/radio-field.js

@@ -4,45 +4,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RadioField = void 0;
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _field = require("./field");
-
 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 RadioField extends _field.Field {
   constructor(...args) {
     var _this;
-
     super(...args);
     _this = this;
-
     this.listener = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (model, {
         transaction
       }) {
         const name = _this.options.name;
-
         if (!model.changed(name)) {
           return;
         }
-
         const value = model.get(name);
-
         if (value) {
           const M = _this.collection.model;
           yield M.update({
@@ -56,29 +44,23 @@ class RadioField extends _field.Field {
           });
         }
       });
-
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
     }();
   }
-
   get dataType() {
     return _sequelize().DataTypes.BOOLEAN;
   }
-
   bind() {
     super.bind();
     this.on('beforeCreate', this.listener);
     this.on('beforeUpdate', this.listener);
   }
-
   unbind() {
     super.unbind();
     this.off('beforeCreate', this.listener);
     this.off('beforeUpdate', this.listener);
   }
-
 }
-
 exports.RadioField = RadioField;

package/lib/fields/relation-field.js

@@ -4,28 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RelationField = void 0;
-
 var _field = require("./field");
-
 class RelationField extends _field.Field {
   /**
    * target relation name
    */
   get target() {
     const _this$options = this.options,
-          target = _this$options.target,
-          name = _this$options.name;
+      target = _this$options.target,
+      name = _this$options.name;
     return target || name;
   }
-
   get foreignKey() {
     return this.options.foreignKey;
   }
-
   get sourceKey() {
     return this.options.sourceKey || this.collection.model.primaryKeyAttribute;
   }
-
   get targetKey() {
     return this.options.targetKey || this.TargetModel.primaryKeyAttribute;
   }
@@ -33,28 +28,21 @@ class RelationField extends _field.Field {
    * get target model from database by it's name
    * @constructor
    */
-
-
   get TargetModel() {
     return this.context.database.sequelize.models[this.target];
   }
-
   clearAccessors() {
     const collection = this.context.collection;
     const association = collection.model.associations[this.name];
-
     if (!association) {
       return;
-    } // @ts-ignore
-
-
+    }
+    // @ts-ignore
     const accessors = Object.values(association.accessors);
     accessors.forEach(accessor => {
       // @ts-ignore
       delete collection.model.prototype[accessor];
     });
   }
-
 }
-
 exports.RelationField = RelationField;

package/lib/fields/set-field.js

@@ -4,32 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SetField = void 0;
-
 var _arrayField = require("./array-field");
-
 class SetField extends _arrayField.ArrayField {
   constructor(...args) {
     super(...args);
-
     this.beforeSave = model => {
       const oldValue = model.get(this.options.name);
-
       if (oldValue) {
         model.set(this.options.name, [...new Set(oldValue)]);
       }
     };
   }
-
   bind() {
     super.bind();
     this.on('beforeSave', this.beforeSave);
   }
-
   unbind() {
     super.unbind();
     this.off('beforeSave', this.beforeSave);
   }
-
 }
-
 exports.SetField = SetField;

package/lib/fields/sort-field.js

@@ -4,85 +4,60 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SortField = void 0;
-
 function _asyncMutex() {
   const data = require("async-mutex");
-
   _asyncMutex = function _asyncMutex() {
     return data;
   };
-
   return data;
 }
-
 function _lodash() {
   const data = require("lodash");
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _field = require("./field");
-
 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 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; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }); }; }
-
 const sortFieldMutex = new (_asyncMutex().Mutex)();
-
 class SortField extends _field.Field {
   constructor(...args) {
     var _this;
-
     super(...args);
     _this = this;
-
     this.setSortValue = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (instance, options) {
         const _this$options = _this.options,
-              name = _this$options.name,
-              scopeKey = _this$options.scopeKey;
+          name = _this$options.name,
+          scopeKey = _this$options.scopeKey;
         const model = _this.context.collection.model;
-
         if ((0, _lodash().isNumber)(instance.get(name)) && instance._previousDataValues[scopeKey] == instance[scopeKey]) {
           return;
         }
-
         const where = {};
-
         if (scopeKey) {
           const value = instance.get(scopeKey);
-
           if (value !== undefined && value !== null) {
             where[scopeKey] = value;
           }
         }
-
         yield sortFieldMutex.runExclusive( /*#__PURE__*/_asyncToGenerator(function* () {
           const max = yield model.max(name, _objectSpread(_objectSpread({}, options), {}, {
             where
@@ -91,107 +66,143 @@ class SortField extends _field.Field {
           instance.set(name, newValue);
         }));
       });
-
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
     }();
-
     this.onScopeChange = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(function* (instance, options) {
         const scopeKey = _this.options.scopeKey;
-
         if (scopeKey && !instance.isNewRecord && instance._previousDataValues[scopeKey] != instance[scopeKey]) {
           yield _this.setSortValue(instance, options);
         }
       });
-
       return function (_x3, _x4) {
         return _ref3.apply(this, arguments);
       };
     }();
-
     this.initRecordsSortValue = /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator(function* ({
         transaction
       }) {
-        const totalCount = yield _this.collection.repository.count({
-          transaction
-        });
-        const emptyCount = yield _this.collection.repository.count({
-          filter: {
-            [_this.name]: null
-          },
-          transaction
-        });
-
-        const orderKey = (() => {
+        const orderField = (() => {
           const model = _this.collection.model;
-
           if (model.primaryKeyAttribute) {
             return model.primaryKeyAttribute;
           }
-
           if (model.rawAttributes['createdAt']) {
-            return 'createdAt';
+            return model.rawAttributes['createdAt'].field;
           }
-
           throw new Error(`can not find order key for collection ${_this.collection.name}`);
         })();
-
-        if (emptyCount === totalCount && emptyCount > 0) {
-          const records = yield _this.collection.repository.find({
-            order: [orderKey],
+        const needInit = /*#__PURE__*/function () {
+          var _ref5 = _asyncToGenerator(function* (scopeKey = null, scopeValue = null) {
+            const filter = {};
+            if (scopeKey && scopeValue) {
+              filter[scopeKey] = scopeValue;
+            }
+            const totalCount = yield _this.collection.repository.count({
+              filter,
+              transaction
+            });
+            const emptyCount = yield _this.collection.repository.count({
+              filter: _objectSpread({
+                [_this.name]: null
+              }, filter),
+              transaction
+            });
+            return emptyCount === totalCount && emptyCount > 0;
+          });
+          return function needInit() {
+            return _ref5.apply(this, arguments);
+          };
+        }();
+        const doInit = /*#__PURE__*/function () {
+          var _ref6 = _asyncToGenerator(function* (scopeKey = null, scopeValue = null) {
+            const queryInterface = _this.collection.db.sequelize.getQueryInterface();
+            const quotedOrderField = queryInterface.quoteIdentifier(orderField);
+            const sql = `
+        WITH ordered_table AS (
+          SELECT *, ROW_NUMBER() OVER (${scopeKey ? `PARTITION BY ${queryInterface.quoteIdentifier(scopeKey)}` : ''} ORDER BY ${quotedOrderField}) AS new_sequence_number
+          FROM ${_this.collection.quotedTableName()}
+          ${(() => {
+              if (scopeKey && scopeValue) {
+                const hasNull = scopeValue.includes(null);
+                return `WHERE ${queryInterface.quoteIdentifier(scopeKey)} IN (${scopeValue.filter(v => v !== null).map(v => `'${v}'`).join(',')}) ${hasNull ? `OR ${queryInterface.quoteIdentifier(scopeKey)} IS NULL` : ''} `;
+              }
+              return '';
+            })()}
+
+        )
+        ${_this.collection.db.inDialect('mysql') ? `
+             UPDATE ${_this.collection.quotedTableName()}, ordered_table
+             SET ${_this.collection.quotedTableName()}.${_this.name} = ordered_table.new_sequence_number
+             WHERE ${_this.collection.quotedTableName()}.${quotedOrderField} = ordered_table.${quotedOrderField}
+            ` : `
+          UPDATE ${_this.collection.quotedTableName()}
+        SET ${queryInterface.quoteIdentifier(_this.name)} = ordered_table.new_sequence_number
+        FROM ordered_table
+        WHERE ${_this.collection.quotedTableName()}.${quotedOrderField} = ${queryInterface.quoteIdentifier('ordered_table')}.${quotedOrderField};
+        `}
+
+      `;
+            yield _this.collection.db.sequelize.query(sql, {
+              transaction
+            });
+          });
+          return function doInit() {
+            return _ref6.apply(this, arguments);
+          };
+        }();
+        const scopeKey = _this.options.scopeKey;
+        if (scopeKey) {
+          const groups = yield _this.collection.repository.find({
+            attributes: [scopeKey],
+            group: [scopeKey],
+            raw: true,
             transaction
           });
-          let start = 1;
-
-          var _iterator = _createForOfIteratorHelper(records),
-              _step;
-
+          const needInitGroups = [];
+          var _iterator = _createForOfIteratorHelper(groups),
+            _step;
           try {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              const record = _step.value;
-              yield record.update({
-                sort: start
-              }, {
-                transaction,
-                silent: true
-              });
-              start += 1;
+              const group = _step.value;
+              if (yield needInit(scopeKey, group[scopeKey])) {
+                needInitGroups.push(group[scopeKey]);
+              }
             }
           } catch (err) {
             _iterator.e(err);
           } finally {
             _iterator.f();
           }
+          if (needInitGroups.length > 0) {
+            yield doInit(scopeKey, needInitGroups);
+          }
+        } else if (yield needInit()) {
+          yield doInit();
         }
       });
-
       return function (_x5) {
         return _ref4.apply(this, arguments);
       };
     }();
   }
-
   get dataType() {
     return _sequelize().DataTypes.BIGINT;
   }
-
   bind() {
     super.bind();
     this.on('afterSync', this.initRecordsSortValue);
     this.on('beforeUpdate', this.onScopeChange);
     this.on('beforeCreate', this.setSortValue);
   }
-
   unbind() {
     super.unbind();
     this.off('beforeUpdate', this.onScopeChange);
     this.off('beforeCreate', this.setSortValue);
     this.off('afterSync', this.initRecordsSortValue);
   }
-
 }
-
 exports.SortField = SortField;

package/lib/fields/string-field.js

@@ -4,24 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.StringField = void 0;
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _field = require("./field");
-
 class StringField extends _field.Field {
   get dataType() {
     return _sequelize().DataTypes.STRING;
   }
-
 }
-
 exports.StringField = StringField;

package/lib/fields/text-field.js

@@ -4,24 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TextField = void 0;
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _field = require("./field");
-
 class TextField extends _field.Field {
   get dataType() {
     return _sequelize().DataTypes.TEXT;
   }
-
 }
-
 exports.TextField = TextField;

package/lib/fields/time-field.js

@@ -4,24 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TimeField = void 0;
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _field = require("./field");
-
 class TimeField extends _field.Field {
   get dataType() {
     return _sequelize().DataTypes.TIME;
   }
-
 }
-
 exports.TimeField = TimeField;