@nocobase/database 0.10.0-alpha.5 → 0.11.0-alpha.1

package/lib/collection-importer.d.ts

@@ -1,4 +1,4 @@
-export declare type ImportFileExtension = 'js' | 'ts' | 'json';
+export type ImportFileExtension = 'js' | 'ts' | 'json';
 export declare class ImporterReader {
     directory: string;
     extensions: Set<string>;

package/lib/collection.d.ts

@@ -5,12 +5,12 @@ import { Database } from './database';
 import { BelongsToField, Field, FieldOptions, HasManyField } from './fields';
 import { Model } from './model';
 import { Repository } from './repository';
-export declare type RepositoryType = typeof Repository;
-export declare type CollectionSortable = string | boolean | {
+export type RepositoryType = typeof Repository;
+export type CollectionSortable = string | boolean | {
     name?: string;
     scopeKey?: string;
 };
-declare type dumpable = 'required' | 'optional' | 'skip';
+type dumpable = 'required' | 'optional' | 'skip';
 export interface CollectionOptions extends Omit<ModelOptions, 'name' | 'hooks'> {
     name: string;
     namespace?: string;
@@ -80,7 +80,7 @@ export declare class Collection<TModelAttributes extends {} = any, TCreationAttr
     resetFields(): void;
     remove(): void;
     removeFromDb(options?: QueryInterfaceDropTableOptions): Promise<void>;
-    existsInDb(options?: Transactionable): any;
+    existsInDb(options?: Transactionable): Promise<boolean>;
     removeField(name: string): void | Field;
     /**
      * TODO

package/lib/collection.js

@@ -450,7 +450,7 @@ class Collection extends _events().EventEmitter {
         fields: index
       };
       indexName = index;
-    } else if (index === null || index === void 0 ? void 0 : index.fields) {
+    } else if (index !== null && index !== void 0 && index.fields) {
       indexItem = index;
       indexName = index.fields;
     }
@@ -565,7 +565,7 @@ class Collection extends _events().EventEmitter {
     }
     const schema = tableNameWithSchema.schema;
     const tableName = tableNameWithSchema.tableName;
-    if ((options === null || options === void 0 ? void 0 : options.ignorePublicSchema) && schema === 'public') {
+    if (options !== null && options !== void 0 && options.ignorePublicSchema && schema === 'public') {
       return tableName;
     }
     return `${schema}.${tableName}`;

package/lib/database.d.ts

@@ -22,7 +22,7 @@ import { CollectionGroupManager } from './collection-group-manager';
 import DatabaseUtils from './database-utils';
 import QueryInterface from './query-interface/query-interface';
 import { BaseValueParser } from './value-parsers';
-export declare type MergeOptions = merge.Options;
+export type MergeOptions = merge.Options;
 export interface PendingOptions {
     field: RelationField;
     model: ModelStatic<Model>;
@@ -36,7 +36,7 @@ export interface IDatabaseOptions extends Options {
     usingBigIntForId?: boolean;
     underscored?: boolean;
 }
-export declare type DatabaseOptions = IDatabaseOptions;
+export type DatabaseOptions = IDatabaseOptions;
 interface RegisterOperatorsContext {
     db?: Database;
     path?: string;
@@ -46,13 +46,13 @@ interface RegisterOperatorsContext {
 export interface CleanOptions extends QueryInterfaceDropAllTablesOptions {
     drop?: boolean;
 }
-export declare type AddMigrationsOptions = {
+export type AddMigrationsOptions = {
     context?: any;
     namespace?: string;
     extensions?: string[];
     directory: string;
 };
-declare type OperatorFunc = (value: any, ctx?: RegisterOperatorsContext) => any;
+type OperatorFunc = (value: any, ctx?: RegisterOperatorsContext) => any;
 export declare const DialectVersionAccessors: {
     sqlite: {
         sql: string;

package/lib/database.js

@@ -138,7 +138,7 @@ class DatabaseVersion {
         const dialect = _Object$keys[_i];
         if (_this.db.inDialect(dialect)) {
           var _result$;
-          if (!(versions === null || versions === void 0 ? void 0 : versions[dialect])) {
+          if (!(versions !== null && versions !== void 0 && versions[dialect])) {
             return false;
           }
           const _yield$_this$db$seque = yield _this.db.sequelize.query(accessors[dialect].sql),

package/lib/decorators/must-have-filter-decorator.js

@@ -11,7 +11,7 @@ const mustHaveFilter = () => (target, propertyKey, descriptor) => {
     if (Array.isArray(options.values)) {
       return oldValue.apply(this, arguments);
     }
-    if (!(options === null || options === void 0 ? void 0 : options.filter) && !(options === null || options === void 0 ? void 0 : options.filterByTk) && !(options === null || options === void 0 ? void 0 : options.forceUpdate)) {
+    if (!(options !== null && options !== void 0 && options.filter) && !(options !== null && options !== void 0 && options.filterByTk) && !(options !== null && options !== void 0 && options.forceUpdate)) {
       throw new Error(`must provide filter or filterByTk for ${propertyKey} call, or set forceUpdate to true`);
     }
     return oldValue.apply(this, arguments);

package/lib/fields/index.d.ts

@@ -41,4 +41,4 @@ 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 | SetFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions;
+export type FieldOptions = BaseFieldOptions | StringFieldOptions | IntegerFieldOptions | FloatFieldOptions | DecimalFieldOptions | DoubleFieldOptions | RealFieldOptions | JsonFieldOptions | JsonbFieldOptions | BooleanFieldOptions | RadioFieldOptions | SortFieldOptions | TextFieldOptions | VirtualFieldOptions | ArrayFieldOptions | SetFieldOptions | TimeFieldOptions | DateFieldOptions | UidFieldOptions | UUIDFieldOptions | PasswordFieldOptions | ContextFieldOptions | BelongsToFieldOptions | HasOneFieldOptions | HasManyFieldOptions | BelongsToManyFieldOptions;

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

@@ -1,5 +1,5 @@
 import { BaseFieldOptions, Field } from './field';
-export declare type BaseRelationFieldOptions = BaseFieldOptions;
+export type BaseRelationFieldOptions = BaseFieldOptions;
 export interface MultipleRelationFieldOptions extends BaseRelationFieldOptions {
     sortBy?: string | string[];
 }

package/lib/fields/uid-field.js

@@ -31,7 +31,7 @@ class UidField extends _field.Field {
       _this$options$prefix = _this$options.prefix,
       prefix = _this$options$prefix === void 0 ? '' : _this$options$prefix,
       pattern = _this$options.pattern;
-    const re = new RegExp(pattern || '^[A-Za-z0-9][A-Za-z0-9_-]*$');
+    const re = new RegExp(pattern || '^[A-Za-z0-9_][A-Za-z0-9_-]*$');
     this.listener = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (instance) {
         const value = instance.get(name);

package/lib/filter-parser.d.ts

@@ -2,7 +2,7 @@ import { ModelStatic } from 'sequelize';
 import { Collection } from './collection';
 import { Database } from './database';
 import { Model } from './model';
-declare type FilterType = any;
+type FilterType = any;
 interface FilterParserContext {
     collection: Collection;
     app?: any;

package/lib/index.d.ts

@@ -1,11 +1,13 @@
-export { DataTypes, ModelStatic, Op, SyncOptions } from 'sequelize';
+export { BaseError, BelongsToGetAssociationMixin, DataTypes, fn, HasManyCountAssociationsMixin, HasManyCreateAssociationMixin, HasManyGetAssociationsMixin, literal, ModelStatic, Op, SyncOptions, Transaction, UniqueConstraintError, ValidationError, ValidationErrorItem, where, } from 'sequelize';
 export * from './collection';
+export * from './collection-group-manager';
 export * from './collection-importer';
 export * from './database';
 export { Database as default } from './database';
 export * from './field-repository/array-field-repository';
 export * from './fields';
 export * from './filter-match';
+export { default as FilterParser } from './filter-parser';
 export * from './inherited-collection';
 export * from './magic-attribute-model';
 export * from './migration';
@@ -20,6 +22,5 @@ export * from './repository';
 export * from './update-associations';
 export { snakeCase } from './utils';
 export * from './value-parsers';
-export * from './collection-group-manager';
 export * from './view-collection';
 export * from './view/view-inference';

package/lib/index.js

@@ -4,34 +4,97 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
+  BaseError: true,
   DataTypes: true,
+  fn: true,
+  literal: true,
   Op: true,
+  Transaction: true,
+  UniqueConstraintError: true,
+  ValidationError: true,
+  ValidationErrorItem: true,
+  where: true,
+  FilterParser: true,
   snakeCase: true
 };
+Object.defineProperty(exports, "BaseError", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().BaseError;
+  }
+});
 Object.defineProperty(exports, "DataTypes", {
   enumerable: true,
   get: function get() {
     return _sequelize().DataTypes;
   }
 });
+Object.defineProperty(exports, "FilterParser", {
+  enumerable: true,
+  get: function get() {
+    return _filterParser.default;
+  }
+});
 Object.defineProperty(exports, "Op", {
   enumerable: true,
   get: function get() {
     return _sequelize().Op;
   }
 });
+Object.defineProperty(exports, "Transaction", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().Transaction;
+  }
+});
+Object.defineProperty(exports, "UniqueConstraintError", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().UniqueConstraintError;
+  }
+});
+Object.defineProperty(exports, "ValidationError", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().ValidationError;
+  }
+});
+Object.defineProperty(exports, "ValidationErrorItem", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().ValidationErrorItem;
+  }
+});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
     return _database.Database;
   }
 });
+Object.defineProperty(exports, "fn", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().fn;
+  }
+});
+Object.defineProperty(exports, "literal", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().literal;
+  }
+});
 Object.defineProperty(exports, "snakeCase", {
   enumerable: true,
   get: function get() {
     return _utils.snakeCase;
   }
 });
+Object.defineProperty(exports, "where", {
+  enumerable: true,
+  get: function get() {
+    return _sequelize().where;
+  }
+});
 function _sequelize() {
   const data = require("sequelize");
   _sequelize = function _sequelize() {
@@ -51,6 +114,18 @@ Object.keys(_collection).forEach(function (key) {
     }
   });
 });
+var _collectionGroupManager = require("./collection-group-manager");
+Object.keys(_collectionGroupManager).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _collectionGroupManager[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _collectionGroupManager[key];
+    }
+  });
+});
 var _collectionImporter = require("./collection-importer");
 Object.keys(_collectionImporter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -111,6 +186,7 @@ Object.keys(_filterMatch).forEach(function (key) {
     }
   });
 });
+var _filterParser = _interopRequireDefault(require("./filter-parser"));
 var _inheritedCollection = require("./inherited-collection");
 Object.keys(_inheritedCollection).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -268,18 +344,6 @@ Object.keys(_valueParsers).forEach(function (key) {
     }
   });
 });
-var _collectionGroupManager = require("./collection-group-manager");
-Object.keys(_collectionGroupManager).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _collectionGroupManager[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _collectionGroupManager[key];
-    }
-  });
-});
 var _viewCollection = require("./view-collection");
 Object.keys(_viewCollection).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -303,4 +367,5 @@ Object.keys(_viewInference).forEach(function (key) {
       return _viewInference[key];
     }
   });
-});
+});
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/model-hook.js

@@ -39,7 +39,7 @@ class ModelHook {
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         const arg = _step.value;
-        if (arg === null || arg === void 0 ? void 0 : arg._previousDataValues) {
+        if (arg !== null && arg !== void 0 && arg._previousDataValues) {
           return arg.constructor.name;
         }
         if (_lodash().default.isPlainObject(arg)) {

package/lib/model.d.ts

@@ -11,7 +11,7 @@ export declare class Model<TModelAttributes extends {} = any, TCreationAttribute
     protected _changedWithAssociations: Set<unknown>;
     protected _previousDataValuesWithAssociations: {};
     toChangedWithAssociations(): void;
-    changedWithAssociations(key?: string, value?: any): boolean | this | unknown[];
+    changedWithAssociations(key?: string, value?: any): boolean | unknown[] | this;
     clearChangedWithAssociations(): void;
     toJSON<T extends TModelAttributes>(): T;
     private hiddenObjKey;

package/lib/operators/child-collection.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = 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() {
@@ -11,22 +18,37 @@ function _sequelize() {
   };
   return data;
 }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const mapVal = (values, db) => values.map(v => {
   const collection = db.getCollection(v);
   return _sequelize().Sequelize.literal(`'${collection.tableNameAsString()}'::regclass`);
 });
+const filterItems = (values, db) => {
+  return _lodash().default.castArray(values).map(v => {
+    const collection = db.getCollection(v);
+    if (!collection) return null;
+    return `'${collection.tableNameAsString()}'::regclass`;
+  }).filter(Boolean);
+};
+const joinValues = items => items.join(', ');
 var _default = {
   $childIn(values, ctx) {
     const db = ctx.db;
-    return {
-      [_sequelize().Op.in]: mapVal(values, db)
-    };
+    const items = filterItems(values, db);
+    if (items.length) {
+      return _sequelize().Sequelize.literal(`"${ctx.model.name}"."tableoid" IN (${joinValues(items)})`);
+    } else {
+      return _sequelize().Sequelize.literal(`1 = 2`);
+    }
   },
   $childNotIn(values, ctx) {
     const db = ctx.db;
-    return {
-      [_sequelize().Op.notIn]: mapVal(values, db)
-    };
+    const items = filterItems(values, db);
+    if (items.length) {
+      return _sequelize().Sequelize.literal(`"${ctx.model.name}"."tableoid" NOT IN (${joinValues(items)})`);
+    } else {
+      return _sequelize().Sequelize.literal(`1 = 1`);
+    }
   }
 };
 exports.default = _default;

package/lib/options-parser.js

@@ -65,7 +65,7 @@ class OptionsParser {
   toSequelizeParams() {
     var _this$options;
     const queryParams = this.filterParser.toSequelizeParams();
-    if ((_this$options = this.options) === null || _this$options === void 0 ? void 0 : _this$options.filterByTk) {
+    if ((_this$options = this.options) !== null && _this$options !== void 0 && _this$options.filterByTk) {
       queryParams.where = {
         [_sequelize().Op.and]: [queryParams.where, {
           [this.context.targetKey || this.collection.filterTargetKey]: this.options.filterByTk
@@ -130,7 +130,7 @@ class OptionsParser {
     var _this$options3, _this$options4, _this$options5, _this$options6;
     const appends = ((_this$options3 = this.options) === null || _this$options3 === void 0 ? void 0 : _this$options3.appends) || [];
     const except = [];
-    if ((_this$options4 = this.options) === null || _this$options4 === void 0 ? void 0 : _this$options4.attributes) {
+    if ((_this$options4 = this.options) !== null && _this$options4 !== void 0 && _this$options4.attributes) {
       return {
         attributes: this.options.attributes
       };
@@ -142,7 +142,7 @@ class OptionsParser {
     if (this.collection.isParent()) {
       OptionsParser.appendInheritInspectAttribute(attributes.include, this.collection);
     }
-    if ((_this$options5 = this.options) === null || _this$options5 === void 0 ? void 0 : _this$options5.fields) {
+    if ((_this$options5 = this.options) !== null && _this$options5 !== void 0 && _this$options5.fields) {
       attributes = [];
       if (this.collection.isParent()) {
         OptionsParser.appendInheritInspectAttribute(attributes, this.collection);
@@ -167,7 +167,7 @@ class OptionsParser {
         _iterator2.f();
       }
     }
-    if ((_this$options6 = this.options) === null || _this$options6 === void 0 ? void 0 : _this$options6.except) {
+    if ((_this$options6 = this.options) !== null && _this$options6 !== void 0 && _this$options6.except) {
       var _iterator3 = _createForOfIteratorHelper(this.options.except),
         _step3;
       try {

package/lib/relation-repository/belongs-to-many-repository.d.ts

@@ -3,7 +3,7 @@ import { Model } from '../model';
 import { AggregateOptions, CreateOptions, DestroyOptions, FindOneOptions, FindOptions, TargetKey, UpdateOptions } from '../repository';
 import { FindAndCountOptions, MultipleRelationRepository } from './multiple-relation-repository';
 import { AssociatedOptions, PrimaryKeyWithThroughValues } from './types';
-declare type CreateBelongsToManyOptions = CreateOptions;
+type CreateBelongsToManyOptions = CreateOptions;
 interface IBelongsToManyRepository<M extends Model> {
     find(options?: FindOptions): Promise<M[]>;
     findAndCount(options?: FindAndCountOptions): Promise<[M[], number]>;

package/lib/relation-repository/belongs-to-repository.d.ts

@@ -1,7 +1,7 @@
 import { Model } from '../model';
 import { CreateOptions, UpdateOptions } from '../repository';
 import { SingleRelationFindOption, SingleRelationRepository } from './single-relation-repository';
-declare type BelongsToFindOptions = SingleRelationFindOption;
+type BelongsToFindOptions = SingleRelationFindOption;
 interface IBelongsToRepository<M extends Model> {
     find(options?: BelongsToFindOptions): Promise<M>;
     findOne(options?: BelongsToFindOptions): Promise<M>;

package/lib/relation-repository/hasmany-repository.js

@@ -42,7 +42,7 @@ class HasManyRepository extends _multipleRelationRepository.MultipleRelationRepo
       const addFilter = {
         [_this.association.foreignKey]: _this.sourceKeyValue
       };
-      if (options === null || options === void 0 ? void 0 : options.filterByTk) {
+      if (options !== null && options !== void 0 && options.filterByTk) {
         addFilter[_this.associationField.targetKey] = options.filterByTk;
       }
       const findOptions = _objectSpread(_objectSpread({}, (0, _lodash().omit)(options, ['filterByTk', 'where', 'values', 'attributes'])), {}, {

package/lib/relation-repository/multiple-relation-repository.d.ts

@@ -1,7 +1,7 @@
 import { MultiAssociationAccessors, Transaction, Transactionable } from 'sequelize';
 import { CommonFindOptions, CountOptions, DestroyOptions, Filter, FindOneOptions, FindOptions, TargetKey, TK, UpdateOptions } from '../repository';
 import { RelationRepository } from './relation-repository';
-export declare type FindAndCountOptions = CommonFindOptions;
+export type FindAndCountOptions = CommonFindOptions;
 export interface AssociatedOptions extends Transactionable {
     tk?: TK;
 }

package/lib/relation-repository/types.d.ts

@@ -1,7 +1,7 @@
 import { TargetKey, Values } from '../repository';
 import { Transactionable } from 'sequelize';
-export declare type PrimaryKeyWithThroughValues = [TargetKey, Values];
+export type PrimaryKeyWithThroughValues = [TargetKey, Values];
 export interface AssociatedOptions extends Transactionable {
     tk?: TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[];
 }
-export declare type setAssociationOptions = TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions;
+export type setAssociationOptions = TargetKey | TargetKey[] | PrimaryKeyWithThroughValues | PrimaryKeyWithThroughValues[] | AssociatedOptions;

package/lib/repository.d.ts

@@ -19,41 +19,41 @@ export { Transactionable } from 'sequelize';
 export interface FilterAble {
     filter: Filter;
 }
-export declare type TargetKey = string | number;
-export declare type TK = TargetKey | TargetKey[];
-declare type FieldValue = string | number | bigint | boolean | Date | Buffer | null | FieldValue[] | FilterWithOperator;
-declare type Operators = keyof typeof operators & keyof WhereOperators;
-export declare type FilterWithOperator = {
+export type TargetKey = string | number;
+export type TK = TargetKey | TargetKey[];
+type FieldValue = string | number | bigint | boolean | Date | Buffer | null | FieldValue[] | FilterWithOperator;
+type Operators = keyof typeof operators & keyof WhereOperators;
+export type FilterWithOperator = {
     [key: string]: {
         [K in Operators]: FieldValue;
     } | FieldValue;
 };
-export declare type FilterWithValue = {
+export type FilterWithValue = {
     [key: string]: FieldValue;
 };
-declare type FilterAnd = {
+type FilterAnd = {
     $and: Filter[];
 };
-declare type FilterOr = {
+type FilterOr = {
     $or: Filter[];
 };
-export declare type Filter = FilterWithOperator | FilterWithValue | FilterAnd | FilterOr;
-export declare type Appends = string[];
-export declare type Except = string[];
-export declare type Fields = string[];
-export declare type Sort = string[] | string;
-export declare type WhiteList = string[];
-export declare type BlackList = string[];
-export declare type AssociationKeysToBeUpdate = string[];
-export declare type Values = any;
-export declare type CountOptions = Omit<SequelizeCountOptions, 'distinct' | 'where' | 'include'> & Transactionable & {
+export type Filter = FilterWithOperator | FilterWithValue | FilterAnd | FilterOr;
+export type Appends = string[];
+export type Except = string[];
+export type Fields = string[];
+export type Sort = string[] | string;
+export type WhiteList = string[];
+export type BlackList = string[];
+export type AssociationKeysToBeUpdate = string[];
+export type Values = any;
+export type CountOptions = Omit<SequelizeCountOptions, 'distinct' | 'where' | 'include'> & Transactionable & {
     filter?: Filter;
     context?: any;
 } & FilterByTk;
 export interface FilterByTk {
     filterByTk?: TargetKey;
 }
-export declare type FindOptions = SequelizeFindOptions & CommonFindOptions & FilterByTk;
+export type FindOptions = SequelizeFindOptions & CommonFindOptions & FilterByTk;
 export interface CommonFindOptions extends Transactionable {
     filter?: Filter;
     fields?: Fields;
@@ -63,14 +63,14 @@ export interface CommonFindOptions extends Transactionable {
     context?: any;
     tree?: boolean;
 }
-export declare type FindOneOptions = Omit<FindOptions, 'limit'>;
+export type FindOneOptions = Omit<FindOptions, 'limit'>;
 export interface DestroyOptions extends SequelizeDestroyOptions {
     filter?: Filter;
     filterByTk?: TargetKey | TargetKey[];
     truncate?: boolean;
     context?: any;
 }
-declare type FindAndCountOptions = Omit<SequelizeAndCountOptions, 'where' | 'include' | 'order'> & CommonFindOptions;
+type FindAndCountOptions = Omit<SequelizeAndCountOptions, 'where' | 'include' | 'order'> & CommonFindOptions;
 export interface CreateOptions extends SequelizeCreateOptions {
     values?: Values | Values[];
     whitelist?: WhiteList;

package/lib/repository.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Repository = void 0;
+function _flat() {
+  const data = require("flat");
+  _flat = function _flat() {
+    return data;
+  };
+  return data;
+}
 function _lodash() {
   const data = _interopRequireDefault(require("lodash"));
   _lodash = function _lodash() {
@@ -20,6 +27,7 @@ function _sequelize() {
 }
 var _mustHaveFilterDecorator = _interopRequireDefault(require("./decorators/must-have-filter-decorator"));
 var _transactionDecorator = require("./decorators/transaction-decorator");
+var _eagerLoadingTree = require("./eager-loading/eager-loading-tree");
 var _arrayFieldRepository = require("./field-repository/array-field-repository");
 var _fields = require("./fields");
 var _filterParser = _interopRequireDefault(require("./filter-parser"));
@@ -30,14 +38,6 @@ var _hasmanyRepository = require("./relation-repository/hasmany-repository");
 var _hasoneRepository = require("./relation-repository/hasone-repository");
 var _updateAssociations = require("./update-associations");
 var _updateGuard = require("./update-guard");
-var _eagerLoadingTree = require("./eager-loading/eager-loading-tree");
-function _flat() {
-  const data = require("flat");
-  _flat = function _flat() {
-    return data;
-  };
-  return data;
-}
 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."); }
@@ -162,10 +162,10 @@ class Repository {
       var _queryOptions$include;
       let options = countOptions ? _lodash().default.clone(countOptions) : {};
       const transaction = yield _this.getTransaction(options);
-      if (countOptions === null || countOptions === void 0 ? void 0 : countOptions.filter) {
+      if (countOptions !== null && countOptions !== void 0 && countOptions.filter) {
         options = _objectSpread(_objectSpread({}, options), _this.parseFilter(countOptions.filter, countOptions));
       }
-      if (countOptions === null || countOptions === void 0 ? void 0 : countOptions.filterByTk) {
+      if (countOptions !== null && countOptions !== void 0 && countOptions.filterByTk) {
         options['where'] = {
           [_sequelize().Op.and]: [options['where'] || {}, {
             [_this.collection.filterTargetKey]: options.filterByTk