Fix more types

Author: KSDaemon

packages/cubejs-client-core/src/Meta.ts

@@ -10,15 +10,16 @@ import {
   TCubeMemberByType,
   Query,
   FilterOperator,
-  TCubeSegment, NotFoundMember
+  TCubeSegment,
+  NotFoundMember,
 } from './types';
 import { DeeplyReadonly } from './index';
 
 export interface CubeMemberWrapper<T> {
   cubeName: string;
   cubeTitle: string;
-  type?: 'view' | 'cube';
-  public?: boolean;
+  type: 'view' | 'cube';
+  public: boolean;
   members: T[];
 }
 
@@ -149,27 +150,14 @@ export default class Meta {
           });
         });
 
-        const timeDimensionMembers = cube.dimensions.filter((m) => m.type === 'time');
-
-        memo.timeDimensions = [
-          ...memo.timeDimensions,
-          {
-            cubeName: cube.name,
-            cubeTitle: cube.title,
-            type: cube.type,
-            public: cube.public,
-            members: timeDimensionMembers,
-          },
-        ];
-
         return memo;
       },
       {
         measures: [],
         dimensions: [],
         segments: [],
         timeDimensions: [],
-      }
+      } as AggregatedMembers
     );
   }
 

packages/cubejs-client-core/src/ResultSet.ts

@@ -20,7 +20,7 @@ import {
   DrillDownLocator,
   LoadResponse,
   LoadResponseResult, Pivot,
-  PivotConfig,
+  PivotConfig, PivotConfigFull,
   PivotQuery,
   PivotRow,
   Query,
@@ -72,7 +72,7 @@ export type ResultSetOptions = {
 /**
  * Provides a convenient interface for data manipulation.
  */
-export default class ResultSet<T extends Record<string, any>> {
+export default class ResultSet<T extends Record<string, any> = any> {
   private readonly loadResponse: LoadResponse<T>;
 
   private readonly loadResponses: LoadResponseResult<T>[];
@@ -365,7 +365,7 @@ export default class ResultSet<T extends Record<string, any>> {
     return axisValues.map(formatValue).join(delimiter);
   }
 
-  public static getNormalizedPivotConfig(query: PivotQuery, pivotConfig?: Partial<PivotConfig>): PivotConfig {
+  public static getNormalizedPivotConfig(query: PivotQuery, pivotConfig?: PivotConfig): PivotConfigFull {
     const defaultPivotConfig: PivotConfig = {
       x: [],
       y: [],
@@ -388,7 +388,7 @@ export default class ResultSet<T extends Record<string, any>> {
       y: []
     });
 
-    const normalizedPivotConfig = mergeDeepLeft(pivotConfig, defaultPivotConfig) as PivotConfig;
+    const normalizedPivotConfig = mergeDeepLeft(pivotConfig, defaultPivotConfig) as PivotConfigFull;
 
     const substituteTimeDimensionMembers = (axis: string[]) => axis.map(
       subDim => (
@@ -431,7 +431,7 @@ export default class ResultSet<T extends Record<string, any>> {
     return normalizedPivotConfig;
   }
 
-  public normalizePivotConfig(pivotConfig?: Partial<PivotConfig>): PivotConfig {
+  public normalizePivotConfig(pivotConfig?: PivotConfig): PivotConfigFull {
     return ResultSet.getNormalizedPivotConfig(this.loadResponse.pivotQuery, pivotConfig);
   }
 
@@ -527,7 +527,7 @@ export default class ResultSet<T extends Record<string, any>> {
    * ```
    * @returns An array of pivoted rows.
    */
-  public pivot(pivotConfig?: Partial<PivotConfig>): PivotRow[] {
+  public pivot(pivotConfig?: PivotConfig): PivotRow[] {
     const normalizedPivotConfig = this.normalizePivotConfig(pivotConfig);
     const { pivotQuery: query } = this.loadResponse;
 
@@ -716,7 +716,7 @@ export default class ResultSet<T extends Record<string, any>> {
    * ]
    * ```
    */
-  public chartPivot(pivotConfig?: Partial<PivotConfig>): ChartPivotRow[] {
+  public chartPivot(pivotConfig?: PivotConfig): ChartPivotRow[] {
     const validate = (value: string) => {
       if (this.parseDateMeasures && LocalDateRegex.test(value)) {
         return new Date(value);
@@ -776,7 +776,7 @@ export default class ResultSet<T extends Record<string, any>> {
    * ```
    * @returns An array of pivoted rows
    */
-  public tablePivot(pivotConfig?: Partial<PivotConfig>): Array<{ [key: string]: string | number | boolean }> {
+  public tablePivot(pivotConfig?: PivotConfig): Array<{ [key: string]: string | number | boolean }> {
     const normalizedPivotConfig = this.normalizePivotConfig(pivotConfig || {});
     const isMeasuresPresent = normalizedPivotConfig.x.concat(normalizedPivotConfig.y).includes('measures');
 
@@ -1043,7 +1043,7 @@ export default class ResultSet<T extends Record<string, any>> {
    * ```
    * @returns An array of series names
    */
-  public seriesNames(pivotConfig?: Partial<PivotConfig>): SeriesNamesColumn[] {
+  public seriesNames(pivotConfig?: PivotConfig): SeriesNamesColumn[] {
     const normalizedPivotConfig = this.normalizePivotConfig(pivotConfig);
     const measures = this.loadResponses
       .map(r => r.annotation.measures)

packages/cubejs-client-core/src/types.ts

@@ -1,5 +1,6 @@
 import Meta from './Meta';
 import { TimeDimensionGranularity } from './time';
+import { TransportOptions } from './HttpTransport';
 
 export type QueryOrder = 'asc' | 'desc' | 'none';
 
@@ -245,11 +246,11 @@ export type PivotConfig = {
   /**
    * Dimensions to put on **x** or **rows** axis.
    */
-  x: string[];
+  x?: string[];
   /**
    * Dimensions to put on **y** or **columns** axis.
    */
-  y: string[];
+  y?: string[];
   /**
    * If `true` missing dates on the time dimensions will be filled with fillWithValue or `0` by default for all measures.Note: the `fillMissingDates` option set to `true` will override any **order** applied to the query
    */
@@ -264,6 +265,11 @@ export type PivotConfig = {
   aliasSeries?: string[];
 };
 
+export type PivotConfigFull = Omit<PivotConfig, 'x' | 'y'> & {
+  x: string[];
+  y: string[];
+};
+
 export type DrillDownLocator = {
   xValues: string[];
   yValues?: string[];

packages/cubejs-client-core/src/utils.ts

@@ -287,10 +287,10 @@ export function movePivotItem(
 ): PivotConfig {
   const nextPivotConfig = {
     ...pivotConfig,
-    x: [...pivotConfig.x],
-    y: [...pivotConfig.y],
+    x: [...(pivotConfig.x || [])],
+    y: [...(pivotConfig.y || [])],
   };
-  const id = pivotConfig[sourceAxis][sourceIndex];
+  const id = pivotConfig[sourceAxis]![sourceIndex];
   const lastIndex = nextPivotConfig[destinationAxis].length - 1;
 
   if (id === 'measures') {