Merge branch 'release/4.0.1'

tandg-digital · Oct 13, 2020 · 967e7cb · 967e7cb
2 parents 72f145b + e663ce9
commit 967e7cb
Show file tree

Hide file tree

Showing 3 changed files with 168 additions and 112 deletions.
diff --git a/package.json b/package.json
@@ -1,8 +1,9 @@
 {
   "name": "objection-filter",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "A filter module for objection.js",
   "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "engines": {
     "node": ">=10.0.0 <=12.x.x"
   },
@@ -62,7 +63,7 @@
     "husky": "^4.2.5",
     "knex": "0.21.1",
     "lint-staged": "^10.2.11",
-    "mocha": "^7.0.1",
+    "mocha": "^8.0.1",
     "mysql": "^2.16.0",
     "nyc": "^15.0.0",
     "objection": "^2.1.2",

diff --git a/src/index.ts b/src/index.ts
@@ -3,6 +3,7 @@ import _FilterQueryBuilder from './lib/FilterQueryBuilder';
 import { sliceRelation as _sliceRelation } from './lib/utils';
 import { createRelationExpression as _createRelationExpression } from './lib/ExpressionBuilder';
 import { BaseModel, FilterQueryBuilderOptions } from './lib/types';
+import { getPropertiesFromExpression as _getPropertiesFromExpression } from './lib/LogicalIterator';
 
 export function buildFilter<M extends BaseModel, K extends typeof Model>(
   modelClass: K,
@@ -14,3 +15,4 @@ export function buildFilter<M extends BaseModel, K extends typeof Model>(
 export const FilterQueryBuilder = _FilterQueryBuilder;
 export const sliceRelation = _sliceRelation;
 export const createRelationExpression = _createRelationExpression;
+export const getPropertiesFromExpression = _getPropertiesFromExpression;