[pull] master from cube-js:master

.github/workflows/push.yml

@@ -410,8 +410,8 @@ jobs:
         bigquery
         snowflake
         firebolt
-        dremio
-      # Athena (just to check for secrets availability)
+#       Athena (just to check for secrets availability)
+#        dremio # Commented out because of flaky integration tests
       DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY: ${{ secrets.DRIVERS_TESTS_ATHENA_CUBEJS_AWS_KEY }}
 
     strategy:
@@ -423,7 +423,8 @@ jobs:
         db: [
             'athena', 'bigquery', 'snowflake', 'trino',
             'clickhouse', 'druid', 'elasticsearch', 'mssql', 'mysql', 'postgres', 'prestodb',
-            'mysql-aurora-serverless', 'crate', 'mongobi', 'firebolt', 'dremio'
+            'mysql-aurora-serverless', 'crate', 'mongobi', 'firebolt',
+#            'dremio' # Commented out because of flaky integration tests
 #            'vertica'
         ]
         use_tesseract_sql_planner: [ false ]

packages/cubejs-api-gateway/package.json

@@ -49,7 +49,8 @@
     "nexus": "^1.1.0",
     "node-fetch": "^2.6.1",
     "ramda": "^0.27.0",
-    "uuid": "^8.3.2"
+    "uuid": "^8.3.2",
+    "zod": "^4.1.13"
   },
   "devDependencies": {
     "@cubejs-backend/linter": "1.5.12",

packages/cubejs-api-gateway/src/dateParser.js → packages/cubejs-api-gateway/src/date-parser.js

@@ -1,7 +1,7 @@
 import moment from 'moment-timezone';
 import { parse } from 'chrono-node';
 
-import { UserError } from './UserError';
+import { UserError } from './user-error';
 
 const momentFromResult = (result, timezone) => {
   const dateMoment = moment().tz(timezone);

packages/cubejs-api-gateway/src/gateway.ts

@@ -77,11 +77,11 @@ import {
   ContextRejectionMiddlewareFn,
   ContextAcceptorFn,
 } from './interfaces';
-import { getRequestIdFromRequest, requestParser } from './requestParser';
-import { UserError } from './UserError';
-import { CubejsHandlerError } from './CubejsHandlerError';
-import { SubscriptionServer, WebSocketSendMessageFn } from './SubscriptionServer';
-import { LocalSubscriptionStore } from './LocalSubscriptionStore';
+import { getRequestIdFromRequest, requestParser } from './request-parser';
+import { UserError } from './user-error';
+import { CubejsHandlerError } from './cubejs-handler-error';
+import { SubscriptionServer, WebSocketSendMessageFn } from './ws/subscription-server';
+import { LocalSubscriptionStore } from './ws/local-subscription-store';
 import {
   getPivotQuery,
   getQueryGranularity,
@@ -97,15 +97,15 @@ import { cachedHandler } from './cached-handler';
 import { createJWKsFetcher } from './jwk';
 import { SQLServer, SQLServerConstructorOptions } from './sql-server';
 import { getJsonQueryFromGraphQLQuery, makeSchema } from './graphql';
-import { ConfigItem, prepareAnnotation } from './helpers/prepareAnnotation';
+import { ConfigItem, prepareAnnotation } from './helpers/prepare-annotation';
 import {
   transformCube,
   transformMeasure,
   transformDimension,
   transformSegment,
   transformJoins,
   transformPreAggregations,
-} from './helpers/transformMetaExtended';
+} from './helpers/transform-meta-extended';
 
 type HandleErrorOptions = {
     e: any,

packages/cubejs-api-gateway/src/helpers/prepareAnnotation.ts → packages/cubejs-api-gateway/src/helpers/prepare-annotation.ts

@@ -7,7 +7,7 @@
 
 import R from 'ramda';
 import { isPredefinedGranularity } from '@cubejs-backend/shared';
-import { MetaConfig, MetaConfigMap, toConfigMap } from './toConfigMap';
+import { MetaConfig, MetaConfigMap, toConfigMap } from './to-config-map';
 import { MemberType } from '../types/strings';
 import { MemberType as MemberTypeEnum } from '../types/enums';
 import { MemberExpression } from '../types/query';

packages/cubejs-api-gateway/src/index.ts

@@ -1,7 +1,10 @@
 export * from './gateway';
 export * from './sql-server';
 export * from './interfaces';
-export * from './CubejsHandlerError';
-export * from './UserError';
-export { getRequestIdFromRequest } from './requestParser';
+export * from './cubejs-handler-error';
+export * from './user-error';
+
+export { getRequestIdFromRequest } from './request-parser';
 export { TransformDataRequest } from './types/responses';
+
+export type { SubscriptionServer } from './ws';

packages/cubejs-api-gateway/src/interfaces.ts

@@ -53,7 +53,7 @@ import {
 import {
   ConfigItem,
   GranularityMeta
-} from './helpers/prepareAnnotation';
+} from './helpers/prepare-annotation';
 
 export {
   AliasToMemberMap,

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

@@ -3,8 +3,8 @@ import moment from 'moment';
 import Joi from 'joi';
 import { getEnv } from '@cubejs-backend/shared';
 
-import { UserError } from './UserError';
-import { dateParser } from './dateParser';
+import { UserError } from './user-error';
+import { dateParser } from './date-parser';
 import { QueryType } from './types/enums';
 
 const getQueryGranularity = (queries) => R.pipe(

packages/cubejs-api-gateway/src/types/responses.ts

@@ -1,4 +1,4 @@
-import type { ConfigItem } from '../helpers/prepareAnnotation';
+import type { ConfigItem } from '../helpers/prepare-annotation';
 import type { NormalizedQuery } from './query';
 import type { QueryType, ResultType } from './strings';
 

packages/cubejs-api-gateway/src/UserError.ts → packages/cubejs-api-gateway/src/user-error.ts

@@ -1,4 +1,4 @@
-import { CubejsHandlerError } from './CubejsHandlerError';
+import { CubejsHandlerError } from './cubejs-handler-error';
 
 export class UserError extends CubejsHandlerError {
   public constructor(message: string) {

packages/cubejs-api-gateway/src/ws/index.ts

@@ -0,0 +1,3 @@
+export * from './local-subscription-store';
+export * from './message-schema';
+export * from './subscription-server';