@nocobase/database 0.9.2-alpha.3 → 0.9.3-alpha.1

package/lib/collection.js

@@ -35,6 +35,7 @@ function _sequelize() {
 var _model = require("./model");
 var _repository = require("./repository");
 var _utils = require("./utils");
+var _adjacencyListRepository = require("./tree-repository/adjacency-list-repository");
 const _excluded = ["name"],
   _excluded2 = ["name"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -215,6 +216,9 @@ class Collection extends _events().EventEmitter {
     if (typeof repository === 'string') {
       repo = this.context.database.repositories.get(repository) || _repository.Repository;
     }
+    if (this.options.tree == 'adjacency-list' || this.options.tree == 'adjacencyList') {
+      repo = _adjacencyListRepository.AdjacencyListRepository;
+    }
     this.repository = new repo(this);
   }
   bindFieldEventListener() {

package/lib/fields/field.js

@@ -196,6 +196,7 @@ class Field {
   }
   unbind() {
     const model = this.context.collection.model;
+    delete model.prototype[this.name];
     model.removeAttribute(this.name);
     if (this.options.index || this.options.unique) {
       this.context.collection.removeIndex([this.name]);

package/lib/listeners/adjacency-list.d.ts

@@ -1,3 +1,2 @@
-import { Collection, CollectionOptions } from '../collection';
+import { CollectionOptions } from '../collection';
 export declare const beforeDefineAdjacencyListCollection: (options: CollectionOptions) => void;
-export declare const afterDefineAdjacencyListCollection: (collection: Collection) => void;

package/lib/listeners/adjacency-list.js

@@ -3,25 +3,7 @@
 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); }); }; }
+exports.beforeDefineAdjacencyListCollection = void 0;
 const beforeDefineAdjacencyListCollection = options => {
   if (!options.tree) {
     return;
@@ -37,55 +19,4 @@ const beforeDefineAdjacencyListCollection = options => {
     }
   });
 };
-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;
+exports.beforeDefineAdjacencyListCollection = beforeDefineAdjacencyListCollection;

package/lib/listeners/index.js

@@ -7,6 +7,5 @@ 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/operators/array.js

@@ -20,6 +20,10 @@ const escape = (value, ctx) => {
   const sequelize = ctx.db.sequelize;
   return sequelize.escape(value);
 };
+const getQueryInterface = ctx => {
+  const sequelize = ctx.db.sequelize;
+  return sequelize.getQueryInterface();
+};
 const sqliteExistQuery = (value, ctx) => {
   const fieldName = getFieldName(ctx);
   const name = ctx.fullName === fieldName ? `"${ctx.model.name}"."${fieldName}"` : `"${fieldName}"`;
@@ -44,10 +48,9 @@ var _default = {
   $match(value, ctx) {
     const fieldName = getFieldName(ctx);
     if ((0, _utils.isPg)(ctx)) {
-      return {
-        [_sequelize().Op.contained]: value,
-        [_sequelize().Op.contains]: value
-      };
+      const name = ctx.fullName === fieldName ? `"${ctx.model.name}"."${fieldName}"` : `"${fieldName}"`;
+      const queryValue = escape(JSON.stringify(value), ctx);
+      return _sequelize().Sequelize.literal(`${name} @> ${queryValue}::JSONB AND ${name} <@ ${queryValue}::JSONB`);
     }
     value = escape(JSON.stringify(value.sort()), ctx);
     if ((0, _utils.isMySQL)(ctx)) {

package/lib/options-parser.js

@@ -252,6 +252,10 @@ class OptionsParser {
         lastLevel = true;
       }
       if (appendFields.length == 2) {
+        const association = associations[appendFields[0]];
+        if (!association) {
+          throw new Error(`association ${appendFields[0]} in ${model.name} not found`);
+        }
         const associationModel = associations[appendFields[0]].target;
         if (associationModel.rawAttributes[appendFields[1]]) {
           lastLevel = true;
@@ -298,6 +302,12 @@ class OptionsParser {
           attributes
         });
       } else {
+        const existInclude = queryParams['include'][existIncludeIndex];
+        if (existInclude.attributes && Array.isArray(existInclude.attributes) && existInclude.attributes.length == 0) {
+          existInclude.attributes = {
+            include: []
+          };
+        }
         setInclude(model.associations[queryParams['include'][existIncludeIndex].association].target, queryParams['include'][existIncludeIndex], appendFields.filter((_, index) => index !== 0).join('.'));
       }
     };

package/lib/repository.js

@@ -135,7 +135,7 @@ class Repository {
    * find
    * @param options
    */
-  find(options) {
+  find(options = {}) {
     var _this2 = this;
     return _asyncToGenerator(function* () {
       const model = _this2.collection.model;
@@ -147,6 +147,7 @@ class Repository {
       if (opts.include && opts.include.length > 0) {
         // @ts-ignore
         const primaryKeyField = model.primaryKeyField || model.primaryKeyAttribute;
+        // find all ids
         const ids = (yield model.findAll(_objectSpread(_objectSpread({}, opts), {}, {
           includeIgnoreAttributes: false,
           attributes: [primaryKeyField],
@@ -165,6 +166,7 @@ class Repository {
         if (ids.length == 0) {
           return [];
         }
+        // find template model
         const templateModel = yield model.findOne(_objectSpread(_objectSpread({}, opts), {}, {
           includeIgnoreAttributes: false,
           attributes: [primaryKeyField],
@@ -180,7 +182,7 @@ class Repository {
         };
         rows = yield (0, _utils.handleAppendsQuery)({
           queryPromises: opts.include.map(include => {
-            const options = _objectSpread(_objectSpread({}, (0, _lodash().omit)(opts, ['limit', 'offset'])), {}, {
+            const options = _objectSpread(_objectSpread({}, (0, _lodash().omit)(opts, ['limit', 'offset', 'filter'])), {}, {
               include: include,
               where,
               transaction
@@ -214,9 +216,8 @@ class Repository {
   findAndCount(options) {
     var _this3 = this;
     return _asyncToGenerator(function* () {
-      const transaction = yield _this3.getTransaction(options);
       options = _objectSpread(_objectSpread({}, options), {}, {
-        transaction
+        transaction: yield _this3.getTransaction(options)
       });
       const count = yield _this3.count(options);
       const results = count ? yield _this3.find(options) : [];

package/lib/tree-repository/adjacency-list-repository.d.ts

@@ -0,0 +1,9 @@
+import { FindOptions, Repository } from '../repository';
+export declare class AdjacencyListRepository extends Repository {
+    update(options: any): Promise<any>;
+    find(options?: FindOptions & {
+        addIndex?: boolean;
+    }): Promise<any>;
+    private addIndex;
+    private querySQL;
+}

package/lib/tree-repository/adjacency-list-repository.js

@@ -0,0 +1,165 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AdjacencyListRepository = void 0;
+var _repository = require("../repository");
+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 _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) { 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 AdjacencyListRepository extends _repository.Repository {
+  update(options) {
+    var _superprop_getUpdate = () => super.update,
+      _this = this;
+    return _asyncToGenerator(function* () {
+      return _superprop_getUpdate().call(_this, _objectSpread(_objectSpread({}, options || {}), {}, {
+        addIndex: false
+      }));
+    })();
+  }
+  find(options = {}) {
+    var _superprop_getFind = () => super.find,
+      _this2 = this;
+    return _asyncToGenerator(function* () {
+      var _collection$treeChild, _collection$treeChild2;
+      if (options.raw || !options.tree) {
+        return yield _superprop_getFind().call(_this2, options);
+      }
+      const collection = _this2.collection;
+      const primaryKey = collection.model.primaryKeyAttribute;
+      if (options.fields && !options.fields.includes(primaryKey)) {
+        options.fields.push(primaryKey);
+      }
+      const parentNodes = yield _superprop_getFind().call(_this2, options);
+      if (parentNodes.length === 0) {
+        return [];
+      }
+      const treeParentField = collection.treeParentField;
+      const foreignKey = treeParentField.options.foreignKey;
+      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 parentIds = parentNodes.map(node => node[primaryKey]);
+      if (parentIds.length == 0) {
+        _this2.database.logger.warn('parentIds is empty');
+        return parentNodes;
+      }
+      const sql = _this2.querySQL(parentIds, collection);
+      const childNodes = yield _this2.database.sequelize.query(sql, {
+        type: 'SELECT',
+        transaction: options.transaction
+      });
+      const childIds = childNodes.map(node => node[primaryKey]);
+      const findChildrenOptions = _objectSpread(_objectSpread({}, _lodash().default.omit(options, ['limit', 'offset', 'filterByTk'])), {}, {
+        filter: {
+          [primaryKey]: childIds
+        }
+      });
+      if (findChildrenOptions.fields) {
+        [primaryKey, foreignKey].forEach(field => {
+          if (!findChildrenOptions.fields.includes(field)) {
+            findChildrenOptions.fields.push(field);
+          }
+        });
+      }
+      const childInstances = yield _superprop_getFind().call(_this2, findChildrenOptions);
+      const nodeMap = {};
+      childInstances.forEach(node => {
+        if (!nodeMap[`${node[foreignKey]}`]) {
+          nodeMap[`${node[foreignKey]}`] = [];
+        }
+        nodeMap[`${node[foreignKey]}`].push(node);
+      });
+      function buildTree(parentId) {
+        const children = nodeMap[parentId];
+        if (!children) {
+          return [];
+        }
+        return children.map(child => {
+          const childrenValues = buildTree(child.id);
+          if (childrenValues.length > 0) {
+            child.setDataValue(childrenKey, childrenValues);
+          }
+          return child;
+        });
+      }
+      var _iterator = _createForOfIteratorHelper(parentNodes),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const parent = _step.value;
+          const parentId = parent[primaryKey];
+          const children = buildTree(parentId);
+          if (children.length > 0) {
+            parent.setDataValue(childrenKey, children);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      _this2.addIndex(parentNodes, childrenKey, options);
+      return parentNodes;
+    })();
+  }
+  addIndex(treeArray, childrenKey, options) {
+    function traverse(node, index) {
+      // patch for sequelize toJSON
+      if (node._options.includeNames && !node._options.includeNames.includes(childrenKey)) {
+        node._options.includeNames.push(childrenKey);
+      }
+      if (options.addIndex !== false) {
+        node.setDataValue('__index', `${index}`);
+      }
+      const children = node.getDataValue(childrenKey);
+      if (children && children.length === 0) {
+        node.setDataValue(childrenKey, undefined);
+      }
+      if (children && children.length > 0) {
+        children.forEach((child, i) => {
+          traverse(child, `${index}.${childrenKey}.${i}`);
+        });
+      }
+    }
+    treeArray.forEach((tree, i) => {
+      traverse(tree, i);
+    });
+  }
+  querySQL(rootIds, collection) {
+    const treeParentField = collection.treeParentField;
+    const foreignKey = treeParentField.options.foreignKey;
+    const foreignKeyField = collection.model.rawAttributes[foreignKey].field;
+    const primaryKey = collection.model.primaryKeyAttribute;
+    const queryInterface = this.database.sequelize.getQueryInterface();
+    const q = queryInterface.quoteIdentifier.bind(queryInterface);
+    return `
+      WITH RECURSIVE cte AS (
+        SELECT ${q(primaryKey)}, ${q(foreignKeyField)}, 1 AS level
+        FROM ${collection.quotedTableName()}
+        WHERE ${q(foreignKeyField)} IN (${rootIds.join(',')})
+        UNION ALL
+        SELECT t.${q(primaryKey)}, t.${q(foreignKeyField)}, cte.level + 1 AS level
+        FROM ${collection.quotedTableName()} t
+               JOIN cte ON t.${q(foreignKeyField)} = cte.${q(primaryKey)}
+      )
+      SELECT ${q(primaryKey)}, ${q(foreignKeyField)} as ${q(foreignKey)}, level
+      FROM cte
+    `;
+  }
+}
+exports.AdjacencyListRepository = AdjacencyListRepository;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.9.2-alpha.3",
+  "version": "0.9.3-alpha.1",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.9.2-alpha.3",
-    "@nocobase/utils": "0.9.2-alpha.3",
+    "@nocobase/logger": "0.9.3-alpha.1",
+    "@nocobase/utils": "0.9.3-alpha.1",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
@@ -28,5 +28,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "b6b5f9372202d942c97d2d90a4197e060db05124"
+  "gitHead": "24979bc561537c0b84469c161eeef1a6de4c4684"
 }

package/src/__tests__/collection.test.ts

@@ -17,6 +17,25 @@ describe('collection', () => {
     await db.close();
   });
 
+  it('should remove sequelize model prototype methods after field remove', async () => {
+    db.collection({
+      name: 'tags',
+    });
+
+    const UserCollection = db.collection({
+      name: 'users',
+      fields: [{ type: 'belongsToMany', name: 'tags' }],
+    });
+
+    console.log(Object.getOwnPropertyNames(UserCollection.model.prototype));
+
+    await UserCollection.removeField('tags');
+
+    console.log(Object.getOwnPropertyNames(UserCollection.model.prototype));
+    // @ts-ignore
+    expect(UserCollection.model.prototype.getTags).toBeUndefined();
+  });
+
   it('should not throw error when create empty collection in sqlite and mysql', async () => {
     if (!db.inDialect('sqlite', 'mysql')) {
       return;