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

package/lib/listeners/adjacency-list.js

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.beforeDefineAdjacencyListCollection = exports.afterDefineAdjacencyListCollection = void 0;
+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) { 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 _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); }); }; }
+const beforeDefineAdjacencyListCollection = options => {
+  if (!options.tree) {
+    return;
+  }
+  (options.fields || []).forEach(field => {
+    if (field.treeParent || field.treeChildren) {
+      if (!field.target) {
+        field.target = options.name;
+      }
+      if (!field.foreignKey) {
+        field.foreignKey = 'parentId';
+      }
+    }
+  });
+};
+exports.beforeDefineAdjacencyListCollection = beforeDefineAdjacencyListCollection;
+const afterDefineAdjacencyListCollection = collection => {
+  if (!collection.options.tree) {
+    return;
+  }
+  collection.model.afterFind( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(function* (instances, options) {
+      var _collection$treeParen, _collection$treeParen2, _collection$treeChild, _collection$treeChild2;
+      if (!options.tree) {
+        return;
+      }
+      const foreignKey = (_collection$treeParen = (_collection$treeParen2 = collection.treeParentField) === null || _collection$treeParen2 === void 0 ? void 0 : _collection$treeParen2.foreignKey) !== null && _collection$treeParen !== void 0 ? _collection$treeParen : 'parentId';
+      const childrenKey = (_collection$treeChild = (_collection$treeChild2 = collection.treeChildrenField) === null || _collection$treeChild2 === void 0 ? void 0 : _collection$treeChild2.name) !== null && _collection$treeChild !== void 0 ? _collection$treeChild : 'children';
+      const arr = Array.isArray(instances) ? instances : [instances];
+      let index = 0;
+      var _iterator = _createForOfIteratorHelper(arr),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const instance = _step.value;
+          const opts = _objectSpread({}, _lodash().default.pick(options, ['tree', 'fields', 'appends', 'except', 'sort']));
+          let __index = `${index++}`;
+          if (options.parentIndex) {
+            __index = `${options.parentIndex}.${__index}`;
+          }
+          instance.setDataValue('__index', __index);
+          const children = yield collection.repository.find(_objectSpread(_objectSpread({
+            filter: {
+              [foreignKey]: instance.id
+            },
+            transaction: options.transaction
+          }, opts), {}, {
+            // @ts-ignore
+            parentIndex: `${__index}.${childrenKey}`,
+            context: options.context
+          }));
+          if ((children === null || children === void 0 ? void 0 : children.length) > 0) {
+            instance.setDataValue(childrenKey, children.map(r => r.toJSON()));
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    });
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+};
+exports.afterDefineAdjacencyListCollection = afterDefineAdjacencyListCollection;

package/lib/listeners/index.d.ts

@@ -0,0 +1,2 @@
+import { Database } from '../database';
+export declare const registerBuiltInListeners: (db: Database) => void;

package/lib/listeners/index.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.registerBuiltInListeners = void 0;
+var _adjacencyList = require("./adjacency-list");
+const registerBuiltInListeners = db => {
+  db.on('beforeDefineCollection', _adjacencyList.beforeDefineAdjacencyListCollection);
+  db.on('afterDefineCollection', _adjacencyList.afterDefineAdjacencyListCollection);
+};
+exports.registerBuiltInListeners = registerBuiltInListeners;

package/lib/magic-attribute-model.js

@@ -4,129 +4,97 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MagicAttributeModel = void 0;
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 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 _model = require("./model");
-
 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); }); }; }
-
 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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
 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 _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; }
-
 const Dottie = require('dottie');
-
 class MagicAttributeModel extends _model.Model {
   get magicAttribute() {
     const db = this.constructor.database;
     const collection = db.getCollection(this.constructor.name);
     return collection.options.magicAttribute || 'options';
   }
-
   set(key, value, options) {
     if (typeof key === 'string') {
       const _key$split = key.split('.'),
-            _key$split2 = _slicedToArray(_key$split, 1),
-            column = _key$split2[0];
-
+        _key$split2 = _slicedToArray(_key$split, 1),
+        column = _key$split2[0];
       if (this.constructor.hasAlias(column)) {
         return this.setV1(key, value, options);
       }
-
       if (this.constructor.rawAttributes[column]) {
         return this.setV1(key, value, options);
       }
-
       if (_lodash().default.isPlainObject(value)) {
         const opts = super.get(this.magicAttribute) || {};
         return this.setV1(`${this.magicAttribute}.${key}`, (0, _utils().merge)(opts === null || opts === void 0 ? void 0 : opts[key], value), options);
       }
-
       return this.setV1(`${this.magicAttribute}.${key}`, value, options);
     } else {
       if (!key) {
         return;
       }
-
       Object.keys(key).forEach(k => {
         this.setV1(k, key[k], options);
       });
     }
-
     return this.setV1(key, value, options);
   }
-
   setV1(key, value, options) {
     let values;
     let originalValue;
-
     if (typeof key === 'object' && key !== null) {
       values = key;
       options = value || {};
-
       if (options.reset) {
         // @ts-ignore
         this.dataValues = {};
-
         for (const key in values) {
           this.changed(key, false);
         }
-      } // If raw, and we're not dealing with includes or special attributes, just set it straight on the dataValues object
+      }
+      // If raw, and we're not dealing with includes or special attributes, just set it straight on the dataValues object
+      // @ts-ignore
+      if (options.raw &&
+      // @ts-ignore
+      !(this._options && this._options.include) && !(options && options.attributes) &&
+      // @ts-ignore
+      !this.constructor._hasDateAttributes &&
       // @ts-ignore
-
-
-      if (options.raw && // @ts-ignore
-      !(this._options && this._options.include) && !(options && options.attributes) && // @ts-ignore
-      !this.constructor._hasDateAttributes && // @ts-ignore
       !this.constructor._hasBooleanAttributes) {
         // @ts-ignore
         if (Object.keys(this.dataValues).length) {
@@ -135,26 +103,22 @@ class MagicAttributeModel extends _model.Model {
         } else {
           // @ts-ignore
           this.dataValues = values;
-        } // If raw, .changed() shouldn't be true
+        }
+        // If raw, .changed() shouldn't be true
         // @ts-ignore
-
-
         this._previousDataValues = _objectSpread({}, this.dataValues);
       } else {
         // Loop and call set
         if (options.attributes) {
           const setKeys = data => {
             var _iterator = _createForOfIteratorHelper(data),
-                _step;
-
+              _step;
             try {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
                 const k = _step.value;
-
                 if (values[k] === undefined) {
                   continue;
                 }
-
                 this.set(k, values[k], options);
               }
             } catch (err) {
@@ -163,15 +127,13 @@ class MagicAttributeModel extends _model.Model {
               _iterator.f();
             }
           };
-
-          setKeys(options.attributes); // @ts-ignore
-
+          setKeys(options.attributes);
+          // @ts-ignore
           if (this.constructor._hasVirtualAttributes) {
             // @ts-ignore
             setKeys(this.constructor._virtualAttributes);
-          } // @ts-ignore
-
-
+          }
+          // @ts-ignore
           if (this._options.includeNames) {
             // @ts-ignore
             setKeys(this._options.includeNames);
@@ -181,35 +143,28 @@ class MagicAttributeModel extends _model.Model {
             this.set(key, values[key], options);
           }
         }
-
         if (options.raw) {
           // If raw, .changed() shouldn't be true
           // @ts-ignore
           this._previousDataValues = _objectSpread({}, this.dataValues);
         }
       }
-
       return this;
     }
-
     if (!options) options = {};
-
     if (!options.raw) {
       // @ts-ignore
       originalValue = this.dataValues[key];
-    } // If not raw, and there's a custom setter
+    }
+    // If not raw, and there's a custom setter
     // @ts-ignore
-
-
     if (!options.raw && this._customSetters[key]) {
       // @ts-ignore
-      this._customSetters[key].call(this, value, key); // custom setter should have changed value, get that changed value
+      this._customSetters[key].call(this, value, key);
+      // custom setter should have changed value, get that changed value
       // TODO: v5 make setters return new value instead of changing internal store
       // @ts-ignore
-
-
       const newValue = this.dataValues[key];
-
       if (!_lodash().default.isEqual(newValue, originalValue)) {
         // @ts-ignore
         this._previousDataValues[key] = originalValue;
@@ -222,11 +177,9 @@ class MagicAttributeModel extends _model.Model {
         // Pass it on to the include handler
         // @ts-ignore
         this._setInclude(key, value, options);
-
         return this;
-      } // Bunch of stuff we won't do when it's raw
-
-
+      }
+      // Bunch of stuff we won't do when it's raw
       if (!options.raw) {
         // If attribute is not in model definition, return
         // @ts-ignore
@@ -235,96 +188,87 @@ class MagicAttributeModel extends _model.Model {
           if (key.includes('.') && this.constructor._jsonAttributes.has(key.split('.')[0])) {
             // @ts-ignore
             const previousNestedValue = Dottie.get(this.dataValues, key);
-
             if (!_lodash().default.isEqual(previousNestedValue, value)) {
               // @ts-ignore
-              this._previousDataValues = _lodash().default.cloneDeep(this._previousDataValues); // @ts-ignore
-
+              this._previousDataValues = _lodash().default.cloneDeep(this._previousDataValues);
+              // @ts-ignore
               Dottie.set(this.dataValues, key, value);
               this.changed(key.split('.')[0], true);
             }
           }
-
           return this;
-        } // If attempting to set primary key and primary key is already defined, return
+        }
+        // If attempting to set primary key and primary key is already defined, return
         // @ts-ignore
-
-
         if (this.constructor._hasPrimaryKeys && originalValue && this.constructor._isPrimaryKey(key)) {
           return this;
-        } // If attempting to set read only attributes, return
+        }
+        // If attempting to set read only attributes, return
+        // @ts-ignore
+        if (!this.isNewRecord &&
+        // @ts-ignore
+        this.constructor._hasReadOnlyAttributes &&
         // @ts-ignore
-
-
-        if (!this.isNewRecord && // @ts-ignore
-        this.constructor._hasReadOnlyAttributes && // @ts-ignore
         this.constructor._readOnlyAttributes.has(key)) {
           return this;
         }
-      } // If there's a data type sanitizer
-
-
-      if (!(value instanceof _sequelize().Utils.SequelizeMethod) && // @ts-ignore
+      }
+      // If there's a data type sanitizer
+      if (!(value instanceof _sequelize().Utils.SequelizeMethod) &&
+      // @ts-ignore
       Object.prototype.hasOwnProperty.call(this.constructor._dataTypeSanitizers, key)) {
         // @ts-ignore
         value = this.constructor._dataTypeSanitizers[key].call(this, value, options);
-      } // Set when the value has changed and not raw
-
-
-      if (!options.raw && ( // True when sequelize method
-      value instanceof _sequelize().Utils.SequelizeMethod || // Check for data type type comparators
+      }
+      // Set when the value has changed and not raw
+      if (!options.raw && (
+      // True when sequelize method
+      value instanceof _sequelize().Utils.SequelizeMethod ||
+      // Check for data type type comparators
       // @ts-ignore
-      !(value instanceof _sequelize().Utils.SequelizeMethod) && // @ts-ignore
-      this.constructor._dataTypeChanges[key] && // @ts-ignore
-      this.constructor._dataTypeChanges[key].call(this, value, originalValue, options) || // Check default
+      !(value instanceof _sequelize().Utils.SequelizeMethod) &&
+      // @ts-ignore
+      this.constructor._dataTypeChanges[key] &&
+      // @ts-ignore
+      this.constructor._dataTypeChanges[key].call(this, value, originalValue, options) ||
+      // Check default
       // @ts-ignore
       !this.constructor._dataTypeChanges[key] && !_lodash().default.isEqual(value, originalValue))) {
         // @ts-ignore
         this._previousDataValues[key] = originalValue;
         this.changed(key, true);
-      } // set data value
+      }
+      // set data value
       // @ts-ignore
-
-
       this.dataValues[key] = value;
     }
-
     return this;
   }
-
   get(key, value) {
     if (typeof key === 'string') {
       const _key$split3 = key.split('.'),
-            _key$split4 = _slicedToArray(_key$split3, 1),
-            column = _key$split4[0];
-
+        _key$split4 = _slicedToArray(_key$split3, 1),
+        column = _key$split4[0];
       if (this.constructor.hasAlias(column)) {
         return super.get(key, value);
       }
-
       if (this.constructor.rawAttributes[column]) {
         return super.get(key, value);
       }
-
       const options = super.get(this.magicAttribute, value);
       return _lodash().default.get(options, key);
     }
-
     const data = super.get(key, value);
     return _objectSpread(_objectSpread({}, _lodash().default.omit(data, this.magicAttribute)), data[this.magicAttribute]);
   }
-
   update(values, options) {
     var _superprop_getUpdate = () => super.update,
-        _this = this;
-
+      _this = this;
     return _asyncToGenerator(function* () {
       // @ts-ignore
       _this._changed = new Set();
       return _superprop_getUpdate().call(_this, values, options);
     })();
   }
-
 }
-
 exports.MagicAttributeModel = MagicAttributeModel;

package/lib/migration.js

@@ -4,64 +4,48 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Migrations = exports.Migration = void 0;
-
 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 Migration {
   constructor(context) {
     this.name = void 0;
     this.context = void 0;
     this.context = context;
   }
-
   get db() {
     return this.context.db;
   }
-
   get sequelize() {
     return this.context.db.sequelize;
   }
-
   get queryInterface() {
     return this.context.db.sequelize.getQueryInterface();
   }
-
-  up() {// todo
-
+  up() {
     return _asyncToGenerator(function* () {})();
-  }
-
-  down() {// todo
+  } // todo
 
+  down() {
     return _asyncToGenerator(function* () {})();
-  }
-
+  } // todo
 }
-
 exports.Migration = Migration;
-
 class Migrations {
   constructor(context) {
     this.items = [];
     this.context = void 0;
     this.context = context;
   }
-
   clear() {
     this.items = [];
   }
-
   add(item) {
     const Migration = item.migration;
-
     if (Migration) {
       const migration = new Migration(_objectSpread(_objectSpread({}, this.context), item.context));
       migration.name = item.name;
@@ -70,21 +54,16 @@ class Migrations {
       this.items.push(item);
     }
   }
-
   callback() {
     var _this = this;
-
     return /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (ctx) {
         return _this.items;
       });
-
       return function (_x) {
         return _ref.apply(this, arguments);
       };
     }();
   }
-
 }
-
 exports.Migrations = Migrations;

package/lib/mock-database.d.ts

@@ -9,10 +9,7 @@ export declare function getConfigByEnv(): {
     host: string;
     port: string;
     dialect: string;
-    logging: boolean | {
-        (...data: any[]): void;
-        (message?: any, ...optionalParams: any[]): void;
-    };
+    logging: boolean | typeof customLogger;
     storage: string;
     define: {
         charset: string;
@@ -21,5 +18,8 @@ export declare function getConfigByEnv(): {
     timezone: string;
     underscored: boolean;
     schema: string;
+    dialectOptions: {};
 };
+declare function customLogger(queryString: any, queryObject: any): void;
 export declare function mockDatabase(options?: IDatabaseOptions): MockDatabase;
+export {};