a few more type fixes

Author: KSDaemon

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

@@ -646,7 +646,7 @@ class CubeApi {
 
 export default (apiToken: string | (() => Promise<string>), options: CubeApiOptions) => new CubeApi(apiToken, options);
 
-export { CubeApi };
+export { CubeApi, Meta, ProgressResult, HttpTransport, SqlQuery };
 export * from './Meta';
 export * from './RequestError';
 export * from './ResultSet';

packages/cubejs-client-ngx/src/client.ts

@@ -55,8 +55,8 @@ export class CubeClient {
   public load(
     query: Query | Query[],
     options?: LoadMethodOptions
-  ): Observable<ResultSet> {
-    return from(<Promise<ResultSet>>this.apiInstance().load(query, options));
+  ): Observable<ResultSet<any>> {
+    return from(<Promise<ResultSet<any>>>this.apiInstance().load(query, options));
   }
 
   public sql(
@@ -77,7 +77,7 @@ export class CubeClient {
     return from(this.apiInstance().meta(options));
   }
 
-  public watch(query, params = {}): Observable<ResultSet> {
+  public watch(query, params = {}): Observable<ResultSet<any>> {
     return new Observable((observer) =>
       query.subscribe({
         next: async (query) => {

packages/cubejs-client-ngx/src/query-builder/builder-meta.ts

@@ -2,13 +2,13 @@ import {
   Meta,
   TCubeDimension,
   TCubeMeasure,
-  TCubeMember,
+  TCubeSegment,
 } from '@cubejs-client/core';
 
 export class BuilderMeta {
   measures: TCubeMeasure[];
   dimensions: TCubeDimension[];
-  segments: TCubeMember[];
+  segments: TCubeSegment[];
   timeDimensions: TCubeDimension[];
   filters: Array<TCubeMeasure | TCubeDimension>;