refactor transformValue and related

Author: KSDaemon

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

@@ -6,25 +6,13 @@
  */
 
 import R from 'ramda';
+import moment, { MomentInput } from 'moment';
 import { UserError } from '../UserError';
 import { ConfigItem } from './prepareAnnotation';
-import {
-  DBResponsePrimitive,
-  DBResponseValue,
-  transformValue,
-} from './transformValue';
-import {
-  NormalizedQuery,
-  QueryTimeDimension
-} from '../types/query';
-import {
-  ResultType,
-  QueryType,
-} from '../types/strings';
-import {
-  ResultType as ResultTypeEnum,
-  QueryType as QueryTypeEnum,
-} from '../types/enums';
+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';
 
 const COMPARE_DATE_RANGE_FIELD = 'compareDateRange';
 const COMPARE_DATE_RANGE_SEPARATOR = ' - ';
@@ -175,6 +163,25 @@ function getMembers(
   return members;
 }
 
+/**
+ * Transform specified `value` with specified `type` to the network
+ * protocol type.
+ */
+function transformValue(
+  value: DBResponseValue,
+  type: string
+): DBResponsePrimitive {
+  // TODO: support for max time
+  if (value && (type === 'time' || value instanceof Date)) {
+    return (
+      value instanceof Date
+        ? moment(value)
+        : moment.utc(value as MomentInput)
+    ).format(moment.HTML5_FMT.DATETIME_LOCAL_MS);
+  }
+  return value as DBResponsePrimitive;
+}
+
 /**
  * Convert DB response object to the compact output format.
  * @internal
@@ -370,4 +377,5 @@ export {
   getCompactRow,
   getVanilaRow,
   transformData,
+  transformValue,
 };

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

@@ -0,0 +1,20 @@
+/**
+ * Query 'or'-filters type definition.
+ */
+export type DBResponsePrimitive =
+  null |
+  boolean |
+  number |
+  string;
+
+export type DBResponseValue =
+  Date |
+  DBResponsePrimitive |
+  { value: DBResponsePrimitive };
+
+export type TransformDataResponse = {
+  members: string[],
+  dataset: DBResponsePrimitive[][]
+} | {
+  [member: string]: DBResponsePrimitive
+}[];

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

@@ -16,9 +16,6 @@ import {
   QueryType as QueryTypeEnum,
   ResultType as ResultTypeEnum,
 } from '../../src/types/enums';
-import {
-  DBResponseValue,
-} from '../../src/helpers/transformValue';
 import {
   ConfigItem,
 } from '../../src/helpers/prepareAnnotation';
@@ -41,6 +38,7 @@ import {
 import {
   QueryType,
 } from '../../src/types/strings';
+import { DBResponseValue } from '../../src/types/responses';
 
 const mockData = {
   regular_discount_by_city: {
@@ -792,7 +790,7 @@ describe('transformData helpers', () => {
           .timeDimensions
       )
     ) as QueryTimeDimension[];
-    
+
     expect(() => {
       getBlendingResponseKey();
     }).toThrow(

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

@@ -5,19 +5,11 @@
  */
 
 /* globals describe,test,expect */
-/* eslint-disable import/no-duplicates */
-/* eslint-disable @typescript-eslint/no-duplicate-imports */
-
 import moment from 'moment';
-import transformValueDef from '../../src/helpers/transformValue';
-import { transformValue } from '../../src/helpers/transformValue';
+
+import { transformValue } from '../../src/helpers/transformData';
 
 describe('transformValue helper', () => {
-  test('export looks as expected', () => {
-    expect(transformValueDef).toBeDefined();
-    expect(transformValue).toBeDefined();
-    expect(transformValue).toEqual(transformValueDef);
-  });
   test('object with the time value', () => {
     const date = Date();
     expect(transformValue(date, 'time')).toBe(