@nocobase/database 0.7.0-alpha.8 → 0.7.0-alpha.80

package/lib/fields/field.js

@@ -1,81 +1,120 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.Field = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+
+function _lodash() {
+  const data = _interopRequireDefault(require("lodash"));
+
+  _lodash = function _lodash() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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 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.context = context;
-        this.database = context.database;
-        this.collection = context.collection;
-        this.options = options || {};
-        this.init();
-    }
-    get name() {
-        return this.options.name;
-    }
-    get type() {
-        return this.options.type;
-    }
-    get dataType() {
-        return this.options.dataType;
-    }
-    // TODO
-    sync(syncOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.collection.sync(Object.assign(Object.assign({}, syncOptions), { force: false, alter: {
-                    drop: false,
-                } }));
-        });
-    }
-    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];
-    }
-    merge(obj) {
-        Object.assign(this.options, obj);
-    }
-    bind() {
-        const { model } = this.context.collection;
-        model.rawAttributes[this.name] = this.toSequelize();
-        // @ts-ignore
-        model.refreshAttributes();
-    }
-    unbind() {
-        const { model } = this.context.collection;
-        model.removeAttribute(this.name);
-    }
-    toSequelize() {
-        const opts = lodash_1.default.omit(this.options, ['name']);
-        if (this.dataType) {
-            Object.assign(opts, { type: this.dataType });
+  get name() {
+    return this.options.name;
+  }
+
+  get type() {
+    return this.options.type;
+  }
+
+  get dataType() {
+    return this.options.dataType;
+  }
+
+  constructor(options, context) {
+    this.options = void 0;
+    this.context = void 0;
+    this.database = void 0;
+    this.collection = void 0;
+    this.context = context;
+    this.database = context.database;
+    this.collection = context.collection;
+    this.options = options || {};
+    this.init();
+  } // TODO
+
+
+  sync(syncOptions) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      yield _this.collection.sync(_objectSpread(_objectSpread({}, syncOptions), {}, {
+        force: false,
+        alter: {
+          drop: false
         }
-        return opts;
-    }
-    isSqlite() {
-        return this.database.sequelize.getDialect() === 'sqlite';
+      }));
+    })();
+  }
+
+  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];
+  }
+
+  merge(obj) {
+    Object.assign(this.options, obj);
+  }
+
+  bind() {
+    const model = this.context.collection.model;
+    model.rawAttributes[this.name] = this.toSequelize(); // @ts-ignore
+
+    model.refreshAttributes();
+  }
+
+  unbind() {
+    const model = this.context.collection.model;
+    model.removeAttribute(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';
+  }
+
 }
-exports.Field = Field;
-//# sourceMappingURL=field.js.map
+
+exports.Field = Field;

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

@@ -1,3 +1,5 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=has-inverse-field.js.map
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -1,62 +1,111 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.HasManyField = void 0;
-const lodash_1 = require("lodash");
-const sequelize_1 = require("sequelize");
-const relation_field_1 = require("./relation-field");
-class HasManyField extends relation_field_1.RelationField {
-    get foreignKey() {
-        if (this.options.foreignKey) {
-            return this.options.foreignKey;
-        }
-        const { model } = this.context.collection;
-        return sequelize_1.Utils.camelize([model.options.name.singular, this.sourceKey || model.primaryKeyAttribute].join('_'));
+
+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 _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; }
+
+class HasManyField extends _relationField.RelationField {
+  get foreignKey() {
+    if (this.options.foreignKey) {
+      return this.options.foreignKey;
     }
-    bind() {
-        const { database, collection } = this.context;
-        const Target = this.TargetModel;
-        if (!Target) {
-            database.addPendingField(this);
-            return false;
-        }
-        if (collection.model.associations[this.name]) {
-            delete collection.model.associations[this.name];
-        }
-        const association = collection.model.hasMany(Target, Object.assign({ as: this.name, foreignKey: this.foreignKey }, (0, lodash_1.omit)(this.options, ['name', 'type', 'target'])));
-        // inverse relation
-        // this.TargetModel.belongsTo(collection.model);
-        // 建立关系之后从 pending 列表中删除
-        database.removePendingField(this);
-        if (!this.options.foreignKey) {
-            this.options.foreignKey = association.foreignKey;
-        }
-        if (!this.options.sourceKey) {
-            // @ts-ignore
-            this.options.sourceKey = association.sourceKey;
-        }
-        return true;
+
+    const model = this.context.collection.model;
+    return _sequelize().Utils.camelize([model.options.name.singular, this.sourceKey || model.primaryKeyAttribute].join('_'));
+  }
+
+  bind() {
+    const _this$context = this.context,
+          database = _this$context.database,
+          collection = _this$context.collection;
+    const Target = this.TargetModel;
+
+    if (!Target) {
+      database.addPendingField(this);
+      return false;
     }
-    unbind() {
-        const { database, collection } = this.context;
-        // 如果关系字段还没建立就删除了，也同步删除待建立关联的关系字段
-        database.removePendingField(this);
-        // 如果关系表内没有显式的创建外键字段，删除关系时，外键也删除掉
-        const tcoll = database.collections.get(this.target);
-        const foreignKey = this.options.foreignKey;
-        const field = tcoll.findField((field) => {
-            if (field.name === foreignKey) {
-                return true;
-            }
-            return field.type === 'belongsTo' && field.foreignKey === foreignKey;
-        });
-        if (!field) {
-            tcoll.model.removeAttribute(foreignKey);
-        }
-        // 删掉 model 的关联字段
-        delete collection.model.associations[this.name];
-        // @ts-ignore
-        collection.model.refreshAttributes();
+
+    if (collection.model.associations[this.name]) {
+      delete collection.model.associations[this.name];
     }
+
+    const association = collection.model.hasMany(Target, _objectSpread({
+      as: this.name,
+      foreignKey: this.foreignKey
+    }, (0, _lodash().omit)(this.options, ['name', 'type', 'target']))); // inverse relation
+    // this.TargetModel.belongsTo(collection.model);
+    // 建立关系之后从 pending 列表中删除
+
+    database.removePendingField(this);
+
+    if (!this.options.foreignKey) {
+      this.options.foreignKey = association.foreignKey;
+    }
+
+    if (!this.options.sourceKey) {
+      // @ts-ignore
+      this.options.sourceKey = association.sourceKey;
+    }
+
+    return true;
+  }
+
+  unbind() {
+    const _this$context2 = this.context,
+          database = _this$context2.database,
+          collection = _this$context2.collection; // 如果关系字段还没建立就删除了，也同步删除待建立关联的关系字段
+
+    database.removePendingField(this); // 如果关系表内没有显式的创建外键字段，删除关系时，外键也删除掉
+
+    const tcoll = database.collections.get(this.target);
+    const foreignKey = this.options.foreignKey;
+    const field = tcoll.findField(field => {
+      if (field.name === foreignKey) {
+        return true;
+      }
+
+      return field.type === 'belongsTo' && field.foreignKey === foreignKey;
+    });
+
+    if (!field) {
+      tcoll.model.removeAttribute(foreignKey);
+    } // 删掉 model 的关联字段
+
+
+    delete collection.model.associations[this.name]; // @ts-ignore
+
+    collection.model.refreshAttributes();
+  }
+
 }
-exports.HasManyField = HasManyField;
-//# sourceMappingURL=has-many-field.js.map
+
+exports.HasManyField = HasManyField;

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

@@ -1,61 +1,112 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.HasOneField = void 0;
-const lodash_1 = require("lodash");
-const sequelize_1 = require("sequelize");
-const relation_field_1 = require("./relation-field");
-class HasOneField extends relation_field_1.RelationField {
-    get target() {
-        const { target, name } = this.options;
-        return target || sequelize_1.Utils.pluralize(name);
+
+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 _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; }
+
+class HasOneField extends _relationField.RelationField {
+  get target() {
+    const _this$options = this.options,
+          target = _this$options.target,
+          name = _this$options.name;
+    return target || _sequelize().Utils.pluralize(name);
+  }
+
+  get foreignKey() {
+    if (this.options.foreignKey) {
+      return this.options.foreignKey;
     }
-    get foreignKey() {
-        if (this.options.foreignKey) {
-            return this.options.foreignKey;
-        }
-        const { model } = this.context.collection;
-        return sequelize_1.Utils.camelize([model.options.name.singular, model.primaryKeyAttribute].join('_'));
+
+    const model = this.context.collection.model;
+    return _sequelize().Utils.camelize([model.options.name.singular, model.primaryKeyAttribute].join('_'));
+  }
+
+  bind() {
+    const _this$context = this.context,
+          database = _this$context.database,
+          collection = _this$context.collection;
+    const Target = this.TargetModel;
+
+    if (!Target) {
+      database.addPendingField(this);
+      return false;
     }
-    bind() {
-        const { database, collection } = this.context;
-        const Target = this.TargetModel;
-        if (!Target) {
-            database.addPendingField(this);
-            return false;
-        }
-        const association = collection.model.hasOne(Target, Object.assign({ as: this.name, foreignKey: this.foreignKey }, (0, lodash_1.omit)(this.options, ['name', 'type', 'target'])));
-        // 建立关系之后从 pending 列表中删除
-        database.removePendingField(this);
-        if (!this.options.foreignKey) {
-            this.options.foreignKey = association.foreignKey;
-        }
-        if (!this.options.sourceKey) {
-            // @ts-ignore
-            this.options.sourceKey = association.sourceKey;
-        }
-        return true;
+
+    const association = collection.model.hasOne(Target, _objectSpread({
+      as: this.name,
+      foreignKey: this.foreignKey
+    }, (0, _lodash().omit)(this.options, ['name', 'type', 'target']))); // 建立关系之后从 pending 列表中删除
+
+    database.removePendingField(this);
+
+    if (!this.options.foreignKey) {
+      this.options.foreignKey = association.foreignKey;
     }
-    unbind() {
-        const { database, collection } = this.context;
-        // 如果关系字段还没建立就删除了，也同步删除待建立关联的关系字段
-        database.removePendingField(this);
-        // 如果关系表内没有显式的创建外键字段，删除关系时，外键也删除掉
-        const tcoll = database.collections.get(this.target);
-        const foreignKey = this.options.foreignKey;
-        const field = tcoll.findField((field) => {
-            if (field.name === foreignKey) {
-                return true;
-            }
-            return field.type === 'belongsTo' && field.foreignKey === foreignKey;
-        });
-        if (!field) {
-            tcoll.model.removeAttribute(foreignKey);
-        }
-        // 删掉 model 的关联字段
-        delete collection.model.associations[this.name];
-        // @ts-ignore
-        collection.model.refreshAttributes();
+
+    if (!this.options.sourceKey) {
+      // @ts-ignore
+      this.options.sourceKey = association.sourceKey;
     }
+
+    return true;
+  }
+
+  unbind() {
+    const _this$context2 = this.context,
+          database = _this$context2.database,
+          collection = _this$context2.collection; // 如果关系字段还没建立就删除了，也同步删除待建立关联的关系字段
+
+    database.removePendingField(this); // 如果关系表内没有显式的创建外键字段，删除关系时，外键也删除掉
+
+    const tcoll = database.collections.get(this.target);
+    const foreignKey = this.options.foreignKey;
+    const field = tcoll.findField(field => {
+      if (field.name === foreignKey) {
+        return true;
+      }
+
+      return field.type === 'belongsTo' && field.foreignKey === foreignKey;
+    });
+
+    if (!field) {
+      tcoll.model.removeAttribute(foreignKey);
+    } // 删掉 model 的关联字段
+
+
+    delete collection.model.associations[this.name]; // @ts-ignore
+
+    collection.model.refreshAttributes();
+  }
+
 }
-exports.HasOneField = HasOneField;
-//# sourceMappingURL=has-one-field.js.map
+
+exports.HasOneField = HasOneField;

package/lib/fields/index.d.ts

@@ -16,6 +16,7 @@ import { StringFieldOptions } from './string-field';
 import { TextFieldOptions } from './text-field';
 import { TimeFieldOptions } from './time-field';
 import { UidFieldOptions } from './uid-field';
+import { UUIDFieldOptions } from './uuid-field';
 import { VirtualFieldOptions } from './virtual-field';
 export * from './array-field';
 export * from './belongs-to-field';
@@ -36,5 +37,6 @@ export * from './string-field';
 export * from './text-field';
 export * from './time-field';
 export * from './uid-field';
+export * from './uuid-field';
 export * from './virtual-field';
-export declare type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | 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 | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions;