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

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

@@ -4,114 +4,97 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BelongsToManyField = void 0;
-
 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 _utils = require("../utils");
-
 var _belongsToField = require("./belongs-to-field");
-
 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; }
-
 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); }
 class BelongsToManyField extends _relationField.RelationField {
   get dataType() {
     return 'BelongsToMany';
   }
-
   get through() {
     return this.options.through || _sequelize().Utils.camelize([this.context.collection.model.name, this.target].map(name => name.toLowerCase()).sort().join('_'));
   }
-
   get otherKey() {
     return this.options.otherKey;
   }
-
   references(association) {
     const db = this.context.database;
     const onDelete = this.options.onDelete || 'CASCADE';
-    return [_belongsToField.BelongsToField.toReference(db, association.toSource, onDelete), _belongsToField.BelongsToField.toReference(db, association.toTarget, onDelete)];
+    const targetAssociation = association.toTarget;
+    if (association.targetKey) {
+      targetAssociation.targetKey = association.targetKey;
+    }
+    const sourceAssociation = association.toSource;
+    if (association.sourceKey) {
+      sourceAssociation.targetKey = association.sourceKey;
+    }
+    return [_belongsToField.BelongsToField.toReference(db, targetAssociation, onDelete), _belongsToField.BelongsToField.toReference(db, sourceAssociation, onDelete)];
   }
-
   bind() {
     const _this$context = this.context,
-          database = _this$context.database,
-          collection = _this$context.collection;
+      database = _this$context.database,
+      collection = _this$context.collection;
     const Target = this.TargetModel;
-
     if (!Target) {
       database.addPendingField(this);
       return false;
     }
-
     const through = this.through;
     let Through;
-
     if (database.hasCollection(through)) {
       Through = database.getCollection(through);
     } else {
       const throughCollectionOptions = {
         name: through
       };
-
+      // set through collection schema
       if (this.collection.collectionSchema()) {
         throughCollectionOptions['schema'] = this.collection.collectionSchema();
       }
-
       Through = database.collection(throughCollectionOptions);
       Object.defineProperty(Through.model, 'isThrough', {
         value: true
       });
     }
-
     if (!this.options.onDelete) {
       this.options.onDelete = 'CASCADE';
     }
-
     const association = collection.model.belongsToMany(Target, _objectSpread(_objectSpread({
       constraints: false
     }, (0, _lodash().omit)(this.options, ['name', 'type', 'target'])), {}, {
       as: this.name,
       through: Through.model
-    })); // 建立关系之后从 pending 列表中删除
-
+    }));
+    // 建立关系之后从 pending 列表中删除
     database.removePendingField(this);
-
     if (!this.options.foreignKey) {
       this.options.foreignKey = association.foreignKey;
     }
-
     if (!this.options.sourceKey) {
       this.options.sourceKey = association.sourceKey;
     }
-
     if (!this.options.otherKey) {
       this.options.otherKey = association.otherKey;
     }
-
     try {
       (0, _utils.checkIdentifier)(this.options.foreignKey);
       (0, _utils.checkIdentifier)(this.options.otherKey);
@@ -119,35 +102,28 @@ class BelongsToManyField extends _relationField.RelationField {
       this.unbind();
       throw error;
     }
-
     if (!this.options.through) {
       this.options.through = this.through;
     }
-
     Through.addIndex([this.options.foreignKey]);
     Through.addIndex([this.options.otherKey]);
     this.references(association).forEach(reference => this.database.referenceMap.addReference(reference));
     return true;
   }
-
   unbind() {
     const _this$context2 = this.context,
-          database = _this$context2.database,
-          collection = _this$context2.collection;
-    const Through = database.getCollection(this.through); // 如果关系字段还没建立就删除了，也同步删除待建立关联的关系字段
-
-    database.removePendingField(this); // 删掉 model 的关联字段
-
+      database = _this$context2.database,
+      collection = _this$context2.collection;
+    const Through = database.getCollection(this.through);
+    // 如果关系字段还没建立就删除了，也同步删除待建立关联的关系字段
+    database.removePendingField(this);
+    // 删掉 model 的关联字段
     const association = collection.model.associations[this.name];
-
     if (association) {
       this.references(association).forEach(reference => this.database.referenceMap.removeReference(reference));
     }
-
     this.clearAccessors();
     delete collection.model.associations[this.name];
   }
-
 }
-
 exports.BelongsToManyField = BelongsToManyField;

package/lib/fields/boolean-field.js

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

package/lib/fields/context-field.js

@@ -4,83 +4,62 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ContextField = void 0;
-
 function _lodash() {
   const data = _interopRequireDefault(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 _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 ContextField extends _field.Field {
   constructor(...args) {
     var _this;
-
     super(...args);
     _this = this;
-
     this.listener = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (model, options) {
         const _this$options = _this.options,
-              name = _this$options.name,
-              dataIndex = _this$options.dataIndex;
+          name = _this$options.name,
+          dataIndex = _this$options.dataIndex;
         const context = options.context;
         model.set(name, _lodash().default.get(context, dataIndex));
         model.changed(name, true);
       });
-
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
     }();
   }
-
   get dataType() {
     const type = this.options.dataType || 'string';
     return _sequelize().DataTypes[type.toUpperCase()] || _sequelize().DataTypes.STRING;
   }
-
   bind() {
     super.bind();
     const createOnly = this.options.createOnly;
     this.on('beforeCreate', this.listener);
-
     if (!createOnly) {
       this.on('beforeUpdate', this.listener);
     }
   }
-
   unbind() {
     super.unbind();
     const createOnly = this.options.createOnly;
     this.off('beforeCreate', this.listener);
-
     if (!createOnly) {
       this.off('beforeUpdate', this.listener);
     }
   }
-
 }
-
 exports.ContextField = ContextField;

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

@@ -2,6 +2,10 @@ import { DataTypes } from 'sequelize';
 import { BaseColumnFieldOptions, Field } from './field';
 export declare class DateField extends Field {
     get dataType(): DataTypes.DateDataType;
+    get timezone(): string;
+    getProps(): any;
+    isDateOnly(): boolean;
+    isGMT(): any;
 }
 export interface DateFieldOptions extends BaseColumnFieldOptions {
     type: 'date';

package/lib/fields/date-field.js

@@ -4,24 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DateField = void 0;
-
 function _sequelize() {
   const data = require("sequelize");
-
   _sequelize = function _sequelize() {
     return data;
   };
-
   return data;
 }
-
 var _field = require("./field");
-
 class DateField extends _field.Field {
   get dataType() {
     return _sequelize().DataTypes.DATE(3);
   }
-
+  get timezone() {
+    return this.isGMT() ? '+00:00' : null;
+  }
+  getProps() {
+    var _this$options, _this$options$uiSchem;
+    return ((_this$options = this.options) === null || _this$options === void 0 ? void 0 : (_this$options$uiSchem = _this$options.uiSchema) === null || _this$options$uiSchem === void 0 ? void 0 : _this$options$uiSchem['x-component-props']) || {};
+  }
+  isDateOnly() {
+    const props = this.getProps();
+    return !props.showTime;
+  }
+  isGMT() {
+    const props = this.getProps();
+    return props.gmt;
+  }
 }
-
 exports.DateField = DateField;

package/lib/fields/field.js

@@ -4,43 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Field = void 0;
-
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 var _utils = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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); }); }; }
-
 class Field {
   constructor(options, context) {
     this.options = void 0;
@@ -53,18 +38,14 @@ class Field {
     this.options = options || {};
     this.init();
   }
-
   get name() {
     return this.options.name;
   }
-
   get type() {
     return this.options.type;
   }
-
   sync(syncOptions) {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       yield _this.collection.sync(_objectSpread(_objectSpread({}, syncOptions), {}, {
         force: false,
@@ -74,91 +55,69 @@ class Field {
       }));
     })();
   }
-
-  init() {// code
+  init() {
+    // code
   }
-
   on(eventName, listener) {
     this.database.on(`${this.collection.name}.${eventName}`, listener);
     return this;
   }
-
   off(eventName, listener) {
     this.database.off(`${this.collection.name}.${eventName}`, listener);
     return this;
   }
-
   get(name) {
     return this.options[name];
   }
-
   remove() {
     this.collection.removeIndex([this.name]);
     return this.collection.removeField(this.name);
   }
-
   columnName() {
     if (this.options.field) {
       return this.options.field;
     }
-
     if (this.database.options.underscored) {
       return (0, _utils.snakeCase)(this.name);
     }
-
     return this.name;
   }
-
   removeFromDb(options) {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       const attribute = _this2.collection.model.rawAttributes[_this2.name];
-
       if (!attribute) {
-        _this2.remove(); // console.log('field is not attribute');
-
-
+        _this2.remove();
+        // console.log('field is not attribute');
         return;
       }
-
       if (_this2.collection.isInherited() && _this2.collection.parentFields().has(_this2.name)) {
         return;
       }
-
       if (_this2.collection.model._virtualAttributes.has(_this2.name)) {
-        _this2.remove(); // console.log('field is virtual attribute');
-
-
+        _this2.remove();
+        // console.log('field is virtual attribute');
         return;
       }
-
       if (_this2.collection.model.primaryKeyAttributes.includes(_this2.name)) {
         // 主键不能删除
         return;
       }
-
       if (_this2.collection.model.options.timestamps !== false) {
         // timestamps 相关字段不删除
         let timestampsFields = ['createdAt', 'updatedAt', 'deletedAt'];
-
         if (_this2.database.options.underscored) {
           timestampsFields = timestampsFields.map(field => (0, _utils.snakeCase)(field));
         }
-
         if (timestampsFields.includes(_this2.columnName())) {
           _this2.collection.fields.delete(_this2.name);
-
           return;
         }
-      } // 排序字段通过 sortable 控制
-
-
+      }
+      // 排序字段通过 sortable 控制
       const sortable = _this2.collection.options.sortable;
-
       if (sortable) {
         let sortField;
-
         if (sortable === true) {
           sortField = 'sort';
         } else if (typeof sortable === 'string') {
@@ -166,108 +125,96 @@ class Field {
         } else if (sortable.name) {
           sortField = sortable.name || 'sort';
         }
-
         if (_this2.name === sortField) {
           return;
         }
-      } // if (this.options.field && this.name !== this.options.field) {
+      }
+      // if (this.options.field && this.name !== this.options.field) {
       //   // field 指向的是真实的字段名，如果与 name 不一样，说明字段只是引用
       //   this.remove();
       //   return;
       // }
-
-
+      if (_this2.collection.isView()) {
+        _this2.remove();
+        return;
+      }
       const columnReferencesCount = _lodash().default.filter(_this2.collection.model.rawAttributes, attr => attr.field == _this2.columnName()).length;
-
       if ((yield _this2.existsInDb({
         transaction: options === null || options === void 0 ? void 0 : options.transaction
       })) && columnReferencesCount == 1) {
         const queryInterface = _this2.database.sequelize.getQueryInterface();
-
-        yield queryInterface.removeColumn(_this2.collection.addSchemaTableName(), _this2.columnName(), options);
+        yield queryInterface.removeColumn(_this2.collection.getTableNameWithSchema(), _this2.columnName(), options);
       }
-
       _this2.remove();
     })();
   }
-
   existsInDb(options) {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       const opts = {
         transaction: options === null || options === void 0 ? void 0 : options.transaction
       };
       let sql;
-
       if (_this3.database.sequelize.getDialect() === 'sqlite') {
-        sql = `SELECT * from pragma_table_info('${_this3.collection.model.tableName}') WHERE name = '${_this3.columnName()}'`;
+        sql = `SELECT *
+             from pragma_table_info('${_this3.collection.model.tableName}')
+             WHERE name = '${_this3.columnName()}'`;
       } else if (_this3.database.inDialect('mysql')) {
         sql = `
         select column_name
         from INFORMATION_SCHEMA.COLUMNS
-        where TABLE_SCHEMA='${_this3.database.options.database}' AND TABLE_NAME='${_this3.collection.model.tableName}' AND column_name='${_this3.columnName()}'
+        where TABLE_SCHEMA = '${_this3.database.options.database}'
+          AND TABLE_NAME = '${_this3.collection.model.tableName}'
+          AND column_name = '${_this3.columnName()}'
       `;
       } else {
         sql = `
         select column_name
         from INFORMATION_SCHEMA.COLUMNS
-        where TABLE_NAME='${_this3.collection.model.tableName}' AND column_name='${_this3.columnName()}' AND table_schema='${_this3.collection.collectionSchema() || 'public'}'
+        where TABLE_NAME = '${_this3.collection.model.tableName}'
+          AND column_name = '${_this3.columnName()}'
+          AND table_schema = '${_this3.collection.collectionSchema() || 'public'}'
       `;
       }
-
       const _yield$_this3$databas = yield _this3.database.sequelize.query(sql, opts),
-            _yield$_this3$databas2 = _slicedToArray(_yield$_this3$databas, 1),
-            rows = _yield$_this3$databas2[0];
-
+        _yield$_this3$databas2 = _slicedToArray(_yield$_this3$databas, 1),
+        rows = _yield$_this3$databas2[0];
       return rows.length > 0;
     })();
   }
-
   merge(obj) {
     Object.assign(this.options, obj);
   }
-
   bind() {
     const model = this.context.collection.model;
-    model.rawAttributes[this.name] = this.toSequelize(); // @ts-ignore
-
+    model.rawAttributes[this.name] = this.toSequelize();
+    // @ts-ignore
     model.refreshAttributes();
-
     if (this.options.index) {
       this.context.collection.addIndex([this.name]);
     }
   }
-
   unbind() {
     const model = this.context.collection.model;
     model.removeAttribute(this.name);
-
     if (this.options.index || this.options.unique) {
       this.context.collection.removeIndex([this.name]);
     }
   }
-
   toSequelize() {
     const opts = _lodash().default.omit(this.options, ['name']);
-
     if (this.dataType) {
       Object.assign(opts, {
         type: this.dataType
       });
     }
-
     return opts;
   }
-
   isSqlite() {
     return this.database.sequelize.getDialect() === 'sqlite';
   }
-
   typeToString() {
     return this.dataType.toString();
   }
-
 }
-
 exports.Field = Field;