types restructure

Author: KSDaemon

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

@@ -154,6 +154,7 @@ function prepareAnnotation(metaConfig: MetaConfig[], query: any) {
 export default prepareAnnotation;
 export {
   ConfigItem,
+  GranularityMeta,
   annotation,
   prepareAnnotation,
 };

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

@@ -12,19 +12,14 @@ import { ConfigItem } from './prepareAnnotation';
 import { NormalizedQuery, QueryTimeDimension } from '../types/query';
 import { QueryType, ResultType, } from '../types/strings';
 import { QueryType as QueryTypeEnum, ResultType as ResultTypeEnum, } from '../types/enums';
-import { DBResponsePrimitive, DBResponseValue } from '../types/responses';
+import { AliasToMemberMap, DBResponsePrimitive, DBResponseValue, TransformDataResponse } from '../types/responses';
 
 const COMPARE_DATE_RANGE_FIELD = 'compareDateRange';
 const COMPARE_DATE_RANGE_SEPARATOR = ' - ';
 const BLENDING_QUERY_KEY_PREFIX = 'time.';
 const BLENDING_QUERY_RES_SEPARATOR = '.';
 const MEMBER_SEPARATOR = '.';
 
-/**
- * SQL aliases to cube properties hash map.
- */
-type AliasToMemberMap = { [alias: string]: string };
-
 /**
  * Parse date range value from time dimension.
  * @internal
@@ -311,12 +306,7 @@ function transformData(
   query: NormalizedQuery,
   queryType: QueryType,
   resType?: ResultType
-): {
-  members: string[],
-  dataset: DBResponsePrimitive[][]
-} | {
-  [member: string]: DBResponsePrimitive
-}[] {
+): TransformDataResponse {
   const d = data as { [sqlAlias: string]: DBResponseValue }[];
   const membersToAliasMap = getMembers(
     queryType,
@@ -364,7 +354,6 @@ function transformData(
 
 export default transformData;
 export {
-  AliasToMemberMap,
   COMPARE_DATE_RANGE_FIELD,
   COMPARE_DATE_RANGE_SEPARATOR,
   BLENDING_QUERY_KEY_PREFIX,

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

@@ -4,3 +4,4 @@ export * from './interfaces';
 export * from './CubejsHandlerError';
 export * from './UserError';
 export { getRequestIdFromRequest } from './requestParser';
+export { TransformDataRequest } from './types/responses';

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

@@ -10,6 +10,7 @@ import {
 
 import {
   QueryType,
+  ResultType,
 } from './types/enums';
 
 import {
@@ -43,9 +44,24 @@ import {
   QueryRequest
 } from './types/request';
 
+import {
+  AliasToMemberMap,
+  TransformDataResponse
+} from './types/responses';
+
+import {
+  ConfigItem,
+  GranularityMeta
+} from './helpers/prepareAnnotation';
+
 export {
+  AliasToMemberMap,
+  TransformDataResponse,
+  ConfigItem,
+  GranularityMeta,
   QueryTimeDimensionGranularity,
   QueryType,
+  ResultType,
   QueryFilter,
   LogicalAndFilter,
   LogicalOrFilter,

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

@@ -1,6 +1,7 @@
-/**
- * Query 'or'-filters type definition.
- */
+import type { ConfigItem } from '../helpers/prepareAnnotation';
+import type { NormalizedQuery } from './query';
+import type { QueryType, ResultType } from './enums';
+
 export type DBResponsePrimitive =
   null |
   boolean |
@@ -18,3 +19,17 @@ export type TransformDataResponse = {
 } | {
   [member: string]: DBResponsePrimitive
 }[];
+
+/**
+ * SQL aliases to cube properties hash map.
+ */
+export type AliasToMemberMap = { [alias: string]: string };
+
+export type TransformDataRequest = {
+  aliasToMemberNameMap: { [alias: string]: string },
+  annotation: { [member: string]: ConfigItem },
+  data: { [sqlAlias: string]: unknown }[],
+  query: NormalizedQuery,
+  queryType: QueryType,
+  resType?: ResultType
+};

packages/cubejs-backend-native/js/index.ts

@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { Writable } from 'stream';
 import type { Request as ExpressRequest } from 'express';
+import type { TransformDataRequest, TransformDataResponse, } from '@cubejs-backend/api-gateway';
 import { CubeStoreResultWrapper } from './CubeStoreResultWrapper';
 
 export * from './CubeStoreResultWrapper';
@@ -366,6 +367,12 @@ export const getCubestoreResult = (ref: CubeStoreResultWrapper): ResultRow[] =>
   return native.getCubestoreResult(ref);
 };
 
+export const transformData = (data: TransformDataRequest): TransformDataResponse => {
+  const native = loadNative();
+
+  return native.transformQueryData(data);
+};
+
 export interface PyConfiguration {
   repositoryFactory?: (ctx: unknown) => Promise<unknown>,
   logger?: (msg: string, params: Record<string, any>) => void,