From c2efadcca6f6a7123372f541d71b9c019ea5c574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Molini=C3=A9?= Date: Thu, 27 Oct 2022 16:46:34 +0200 Subject: [PATCH] chore: upgrade forest-express --- package.json | 2 +- test/services/filters-parser.test.js | 4 ++-- yarn.lock | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 3d4f322c..7092a324 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@babel/runtime": "7.15.4", "bluebird": "2.9.25", "core-js": "3.6.5", - "forest-express": "10.0.0-beta.1", + "forest-express": "10.0.0-beta.2", "http-errors": "1.6.1", "lodash": "4.17.21", "moment": "2.29.4", diff --git a/test/services/filters-parser.test.js b/test/services/filters-parser.test.js index d82138a6..acebfad4 100644 --- a/test/services/filters-parser.test.js +++ b/test/services/filters-parser.test.js @@ -1,6 +1,6 @@ import moment from 'moment'; import Sequelize from 'sequelize'; -import { SchemaUtils } from 'forest-express'; +import { Schemas, SchemaUtils } from 'forest-express'; import FiltersParser from '../../src/services/filters-parser'; import Operators from '../../src/utils/operators'; import { NoMatchingOperatorError } from '../../src/services/errors'; @@ -227,6 +227,7 @@ describe('services > filters-parser', () => { const schemaWithFields = { fields: [{ field: 'car', reference: 'car.id' }], }; + Schemas.schemas = { car: { fields: [{ field: 'id', type: 'Number' }] } }; const filters = { field: 'car:brandName', operator: 'starts_with', value: 'Ferrari' }; const filtersParser = new FiltersParser(schemaWithFields, timezone, sequelizeOptions); @@ -235,7 +236,6 @@ describe('services > filters-parser', () => { const spy = jest.spyOn(SchemaUtils, 'isSmartField').mockReturnValue(false); - console.log('Peforming filter'); expect(await filtersParser.perform(filters)) .toStrictEqual({ '$car.brandName$': { [OPERATORS.LIKE]: 'Ferrari%' } }); diff --git a/yarn.lock b/yarn.lock index 79d63a00..d15f2ace 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1199,10 +1199,10 @@ resolved "https://registry.yarnpkg.com/@forestadmin/context/-/context-1.31.0.tgz#b4b5a3b589e52d337a1f45807db22c2860e640a7" integrity sha512-RQkDBkq+6ySMv+YNezz9VWSyCsqD7fj/+bXrXhQ6lJ62nbRUIUheH7ApvXwfnwFR1u55oT6Yhar11t6DaiE9Ig== -"@forestadmin/forestadmin-client@1.0.0-alpha.1": - version "1.0.0-alpha.1" - resolved "https://registry.yarnpkg.com/@forestadmin/forestadmin-client/-/forestadmin-client-1.0.0-alpha.1.tgz#9845443ad86698ab16f2c302d0ee2cdd7060daf0" - integrity sha512-vmLOwZXkk5Ff50IeEaqir4cM6cZPXvNW/rMUH5CcTh7xlcpjjRjZVld6FGns/HDKWNlQBsrpMCBPTTdtW4LLLA== +"@forestadmin/forestadmin-client@1.0.0-alpha.2": + version "1.0.0-alpha.2" + resolved "https://registry.yarnpkg.com/@forestadmin/forestadmin-client/-/forestadmin-client-1.0.0-alpha.2.tgz#84e9aabb5d5b8c0fd021d372c40c63991a9d20a7" + integrity sha512-Y4IE7Hyxo8z+LtM9zvRrN1K8jUI9ZlwFhbIP4P4phpnJ6hthU0NVxraYwvVWcM/Z0q3efGjC8ciG8yJnZ/RFVg== dependencies: jsonwebtoken "^8.5.1" lru-cache "^7.3.1" @@ -4599,14 +4599,14 @@ for-in@^1.0.2: resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= -forest-express@10.0.0-beta.1: - version "10.0.0-beta.1" - resolved "https://registry.yarnpkg.com/forest-express/-/forest-express-10.0.0-beta.1.tgz#d28ce6903c371eec3b1024a597c45234a8272a1c" - integrity sha512-aZVLFFHEd5Lk1hy9Wc+DlvDsz2YCIvFTz3jDSJEULHHA6jWb7z7LW7KRvcMUi9tR9IriyXNzzXjJU2EYr7xYOw== +forest-express@10.0.0-beta.2: + version "10.0.0-beta.2" + resolved "https://registry.yarnpkg.com/forest-express/-/forest-express-10.0.0-beta.2.tgz#19789d5f6f4de5ebbd8e60a91738bc68fec7c920" + integrity sha512-ouzfdcCy88+8lGQKb8qcd+iCRbvJFNc8FTTLEGbxFLrtXZE9r9Qi/yEzbkqZuA9yYgOqYu8QN1l2mZWAwxB1sw== dependencies: "@babel/runtime" "7.19.0" "@forestadmin/context" "1.31.0" - "@forestadmin/forestadmin-client" "1.0.0-alpha.1" + "@forestadmin/forestadmin-client" "1.0.0-alpha.2" base32-encode "1.1.1" bitwise-xor "0.0.0" bluebird "3.7.1"