chore: replace deprecated @hapi/joi with joi

packages/cubejs-api-gateway/package.json

@@ -36,6 +36,7 @@
     "express-graphql": "^0.12.0",
     "graphql": "^15.8.0",
     "graphql-scalars": "^1.10.0",
+    "joi": "^17.8.3",
     "jsonwebtoken": "^8.3.0",
     "jwk-to-pem": "^2.0.4",
     "moment": "^2.24.0",
@@ -49,7 +50,6 @@
   "devDependencies": {
     "@cubejs-backend/linter": "^0.32.0",
     "@types/express": "^4.17.9",
-    "@types/hapi__joi": "^15.0.4",
     "@types/jest": "^26.0.20",
     "@types/jsonwebtoken": "^8.5.0",
     "@types/jwk-to-pem": "^2.0.0",

packages/cubejs-api-gateway/src/query.js

@@ -1,6 +1,6 @@
 import R from 'ramda';
 import moment from 'moment';
-import Joi from '@hapi/joi';
+import Joi from 'joi';
 
 import { UserError } from './UserError';
 import { dateParser } from './dateParser';
@@ -68,13 +68,13 @@ const operators = [
 const oneFilter = Joi.object().keys({
   dimension: id,
   member: id,
-  operator: Joi.valid(operators).required(),
-  values: Joi.array().items(Joi.string().allow('', null), Joi.lazy(() => oneFilter))
+  operator: Joi.valid(...operators).required(),
+  values: Joi.array().items(Joi.string().allow('', null), Joi.link('...'))
 }).xor('dimension', 'member');
 
 const oneCondition = Joi.object().keys({
-  or: Joi.array().items(oneFilter, Joi.lazy(() => oneCondition).description('oneCondition schema')),
-  and: Joi.array().items(oneFilter, Joi.lazy(() => oneCondition).description('oneCondition schema')),
+  or: Joi.array().items(oneFilter, Joi.link('...').description('oneCondition schema')),
+  and: Joi.array().items(oneFilter, Joi.link('...').description('oneCondition schema')),
 }).xor('or', 'and');
 
 const querySchema = Joi.object().keys({
@@ -167,7 +167,7 @@ const validatePostRewrite = (query) => {
  * @returns {NormalizedQuery}
  */
 const normalizeQuery = (query) => {
-  const { error } = Joi.validate(query, querySchema);
+  const { error } = querySchema.validate(query);
   if (error) {
     throw new UserError(`Invalid query format: ${error.message || error.toString()}`);
   }
@@ -246,7 +246,7 @@ const queryPreAggregationsSchema = Joi.object().keys({
 });
 
 const normalizeQueryPreAggregations = (query, defaultValues) => {
-  const { error } = Joi.validate(query, queryPreAggregationsSchema);
+  const { error } = queryPreAggregationsSchema.validate(query);
   if (error) {
     throw new UserError(`Invalid query format: ${error.message || error.toString()}`);
   }
@@ -272,7 +272,7 @@ const queryPreAggregationPreviewSchema = Joi.object().keys({
 });
 
 const normalizeQueryPreAggregationPreview = (query) => {
-  const { error } = Joi.validate(query, queryPreAggregationPreviewSchema);
+  const { error } = queryPreAggregationPreviewSchema.validate(query);
   if (error) {
     throw new UserError(`Invalid query format: ${error.message || error.toString()}`);
   }
@@ -286,7 +286,7 @@ const queryCancelPreAggregationPreviewSchema = Joi.object().keys({
 });
 
 const normalizeQueryCancelPreAggregations = query => {
-  const { error } = Joi.validate(query, queryCancelPreAggregationPreviewSchema);
+  const { error } = queryCancelPreAggregationPreviewSchema.validate(query);
   if (error) {
     throw new UserError(`Invalid query format: ${error.message || error.toString()}`);
   }

packages/cubejs-schema-compiler/package.json

@@ -41,12 +41,12 @@
     "@babel/traverse": "^7.12.10",
     "@babel/types": "^7.12.12",
     "@cubejs-backend/shared": "^0.32.0",
-    "@hapi/joi": "^17.1.1",
     "antlr4ts": "0.5.0-alpha.4",
     "camelcase": "^6.2.0",
     "cron-parser": "^3.5.0",
     "humps": "^2.0.1",
     "inflection": "^1.12.0",
+    "joi": "^17.8.3",
     "js-yaml": "^4.1.0",
     "lru-cache": "^5.1.1",
     "moment-range": "^4.0.1",
@@ -63,7 +63,6 @@
     "@types/babel__generator": "^7.6.2",
     "@types/babel__parser": "^7.1.1",
     "@types/babel__traverse": "^7.11.0",
-    "@types/hapi__joi": "^17.1.1",
     "@types/inflection": "^1.5.28",
     "@types/jest": "^26.0.20",
     "@types/lru-cache": "^5.1.0",

packages/cubejs-schema-compiler/src/compiler/CubeValidator.js

@@ -1,4 +1,4 @@
-const Joi = require('@hapi/joi');
+const Joi = require('joi');
 const cronParser = require('cron-parser');
 
 /* *****************************

packages/cubejs-server-core/package.json

@@ -37,11 +37,11 @@
     "@cubejs-backend/schema-compiler": "^0.32.0",
     "@cubejs-backend/shared": "^0.32.0",
     "@cubejs-backend/templates": "^0.32.0",
-    "@hapi/joi": "^15.1.1",
     "codesandbox-import-utils": "^2.1.12",
     "cross-spawn": "^7.0.1",
     "fs-extra": "^8.1.0",
     "is-docker": "^2.1.1",
+    "joi": "^17.8.3",
     "jsonwebtoken": "^8.4.0",
     "lodash.clonedeep": "^4.5.0",
     "lru-cache": "^5.1.1",
@@ -63,7 +63,6 @@
     "@types/cross-spawn": "^6.0.2",
     "@types/express": "^4.17.9",
     "@types/fs-extra": "^9.0.8",
-    "@types/hapi__joi": "^15.0.4",
     "@types/jest": "^26.0.20",
     "@types/jsonwebtoken": "^8.5.0",
     "@types/lru-cache": "^5.1.0",

packages/cubejs-server-core/src/core/optionsValidate.ts

@@ -1,4 +1,4 @@
-import Joi from '@hapi/joi';
+import Joi from 'joi';
 import DriverDependencies from './DriverDependencies';
 
 const schemaQueueOptions = Joi.object().keys({
@@ -151,7 +151,7 @@ const schemaOptions = Joi.object().keys({
 });
 
 export default (options: any) => {
-  const { error } = Joi.validate(options, schemaOptions, { abortEarly: false, });
+  const { error } = schemaOptions.validate(options, { abortEarly: false });
   if (error) {
     throw new Error(`Invalid cube-server-core options: ${error.message || error.toString()}`);
   }

packages/cubejs-server-core/test/unit/OptsHandler.test.ts

@@ -74,7 +74,7 @@ describe('OptsHandler class', () => {
       dbType: undefined,
       driverFactory: undefined,
     });
-    
+
     expect(core.options.dbType).toBeDefined();
     expect(typeof core.options.dbType).toEqual('function');
     expect(await core.options.dbType({} as DriverContext))
@@ -160,7 +160,7 @@ describe('OptsHandler class', () => {
         type: <DatabaseType>process.env.CUBEJS_DB_TYPE,
       }),
     });
-    
+
     expect(core.options.dbType).toBeDefined();
     expect(typeof core.options.dbType).toEqual('function');
     expect(await core.options.dbType({} as DriverContext))
@@ -180,7 +180,7 @@ describe('OptsHandler class', () => {
         type: <DatabaseType>process.env.CUBEJS_DB_TYPE,
       }),
     });
-    
+
     expect(core.options.dbType).toBeDefined();
     expect(typeof core.options.dbType).toEqual('function');
     expect(await core.options.dbType({} as DriverContext))
@@ -200,7 +200,7 @@ describe('OptsHandler class', () => {
         type: <DatabaseType>process.env.CUBEJS_DB_TYPE,
       }),
     });
-    
+
     expect(core.options.dbType).toBeDefined();
     expect(typeof core.options.dbType).toEqual('function');
     expect(await core.options.dbType({} as DriverContext))
@@ -220,7 +220,7 @@ describe('OptsHandler class', () => {
         type: <DatabaseType>process.env.CUBEJS_DB_TYPE,
       }),
     });
-    
+
     expect(core.options.dbType).toBeDefined();
     expect(typeof core.options.dbType).toEqual('function');
     expect(await core.options.dbType({} as DriverContext))
@@ -260,8 +260,7 @@ describe('OptsHandler class', () => {
       });
       await core.options.driverFactory(<DriverContext>{ dataSource: 'default' });
     }).rejects.toThrow(
-      'Invalid cube-server-core options: child "driverFactory" fails because ' +
-      '["driverFactory" must be a Function]'
+      'Invalid cube-server-core options: "driverFactory" must be of type function'
     );
 
     // Case 3 -- need to be restored after assertion will be restored.
@@ -303,8 +302,7 @@ describe('OptsHandler class', () => {
       });
       await core.options.dbType(<DriverContext>{ dataSource: 'default' });
     }).rejects.toThrow(
-      'Invalid cube-server-core options: child "dbType" fails because ' +
-      '["dbType" must be a string, "dbType" must be a Function]'
+      'Invalid cube-server-core options: "dbType" does not match any of the allowed types'
     );
 
     // Case 6
@@ -402,7 +400,7 @@ describe('OptsHandler class', () => {
     const opts = oapi.options;
     const testDriverConnectionSpy = jest.spyOn(oapi, 'testDriverConnection');
     oapi.seenDataSources = ['default'];
-    
+
     expect(core.optsHandler.configuredForScheduledRefresh()).toBe(true);
     expect(opts.rollupOnlyMode).toBe(false);
     expect(opts.preAggregationsOptions.externalRefresh).toBe(false);
@@ -503,7 +501,7 @@ describe('OptsHandler class', () => {
       });
 
       const opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
-      
+
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
@@ -533,7 +531,7 @@ describe('OptsHandler class', () => {
       });
 
       const opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
-      
+
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
@@ -563,7 +561,7 @@ describe('OptsHandler class', () => {
       });
 
       const opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
-      
+
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
@@ -593,7 +591,7 @@ describe('OptsHandler class', () => {
       });
 
       const opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
-      
+
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
@@ -623,7 +621,7 @@ describe('OptsHandler class', () => {
       });
 
       const opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
-      
+
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
@@ -667,7 +665,7 @@ describe('OptsHandler class', () => {
       });
 
       const opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
-      
+
       expect(opts.queryCacheOptions.queueOptions).toBeDefined();
       expect(typeof opts.queryCacheOptions.queueOptions).toEqual('function');
       expect(await opts.queryCacheOptions.queueOptions()).toEqual({
@@ -713,7 +711,7 @@ describe('OptsHandler class', () => {
     });
     opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
     driver = <any>(await core.resolveDriver(<DriverContext>{}, opts));
-    
+
     expect(driver.pool.options.max).toEqual(2 * (concurrency1 + concurrency2));
 
     // Case 2
@@ -736,7 +734,7 @@ describe('OptsHandler class', () => {
     });
     opts = (<any>core.getOrchestratorApi(<RequestContext>{})).options;
     driver = <any>(await core.resolveDriver(<DriverContext>{}));
-    
+
     expect(driver.pool.options.max).toEqual(8);
   });
 

packages/cubejs-server-core/test/unit/index.test.ts

@@ -32,7 +32,7 @@ const repositoryWithoutPreAggregations: SchemaFileRepository = {
       fileName: 'main.js', content: `
 cube('Bar', {
   sql: 'select * from bar',
-  
+
   measures: {
     count: {
       type: 'count'
@@ -61,7 +61,7 @@ const repositoryWithDataSource: SchemaFileRepository = {
   dataSchemaFiles: () => Promise.resolve([{ fileName: 'main.js', content: `
 cube('Bar', {
   sql: 'select * from bar',
-  
+
   measures: {
     count: {
       type: 'count'
@@ -72,7 +72,7 @@ cube('Bar', {
       sql: 'timestamp',
       type: 'time'
     }
-  }, 
+  },
   dataSource: 'main'
 });
 ` }]),
@@ -124,7 +124,7 @@ describe('index.test', () => {
     };
 
     expect(() => new CubejsServerCore(options))
-      .toThrowError(/"compilerCacheSize" must be larger than or equal to 0/);
+      .toThrowError(/"compilerCacheSize" must be greater than or equal to 0/);
   });
 
   test('Should create instance of CubejsServerCore, orchestratorOptions as func', () => {
@@ -397,7 +397,7 @@ describe('index.test', () => {
       expect(dataSources.dataSources).toEqual([]);
     });
   });
-  
+
   describe('CompilerApi dataSources method', () => {
     const logger = jest.fn(() => {});
     const compilerApi = new CompilerApi(