add DataResult interface + implement it in result wrappers

Author: KSDaemon

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

@@ -11,9 +11,8 @@ import {
   QueryAlias,
 } from '@cubejs-backend/shared';
 import {
-  getFinalQueryResult,
-  getFinalQueryResultArray,
-  getFinalQueryResultMulti,
+  ResultArrayWrapper,
+  ResultMultiWrapper,
   ResultWrapper,
 } from '@cubejs-backend/native';
 import type {
@@ -1814,29 +1813,12 @@ class ApiGateway {
 
       if (props.queryType === 'multi') {
         // We prepare the final json result on native side
-        const [transformDataJson, rawDataRef, cleanResultList] = results.reduce<[Object[], any[], Object[]]>(
-          ([transformList, rawList, resultList], r) => {
-            transformList.push(r.getTransformData());
-            rawList.push(r.getRawData());
-            resultList.push(r.getRootResultObject());
-            return [transformList, rawList, resultList];
-          },
-          [[], [], []]
-        );
-
-        const responseDataObj = {
-          queryType,
-          results: cleanResultList,
-          slowQuery
-        };
-
-        res(await getFinalQueryResultMulti(transformDataJson, rawDataRef, responseDataObj));
+        const resultMulti = new ResultMultiWrapper(results, { queryType, slowQuery });
+        res(await resultMulti.getFinalResult());
       } else {
         // We prepare the full final json result on native side
         const r = results[0];
-        res(await getFinalQueryResult(
-          r.getTransformData(), r.getRawData(), r.getRootResultObject()
-        ));
+        res(await r.getFinalResult());
       }
     } catch (e: any) {
       this.handleError({
@@ -1970,17 +1952,8 @@ class ApiGateway {
           res(results[0]);
         } else {
           // We prepare the final json result on native side
-          const [transformDataJson, rawData, resultDataJson] = (results as ResultWrapper[]).reduce<[Object[], any[], Object[]]>(
-            ([transformList, rawList, resultList], r) => {
-              transformList.push(r.getTransformData());
-              rawList.push(r.getRawData());
-              resultList.push(r.getRootResultObject());
-              return [transformList, rawList, resultList];
-            },
-            [[], [], []]
-          );
-
-          res(await getFinalQueryResultArray(transformDataJson, rawData, resultDataJson));
+          const resultArray = new ResultArrayWrapper(results);
+          res(await resultArray.getFinalResult());
         }
       }
     } catch (e: any) {

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

@@ -1,6 +1,16 @@
-import { getCubestoreResult, ResultRow } from './index';
+import {
+  getCubestoreResult,
+  getFinalQueryResult,
+  getFinalQueryResultArray,
+  getFinalQueryResultMulti,
+  ResultRow
+} from './index';
+
+export interface DataResult {
+  getFinalResult(): Promise<any>;
+}
 
-export class ResultWrapper {
+export class ResultWrapper implements DataResult {
   private readonly proxy: any;
 
   private cache: any;
@@ -112,4 +122,52 @@ export class ResultWrapper {
   public getRootResultObject(): any {
     return this.rootResultObject;
   }
+
+  public async getFinalResult(): Promise<any> {
+    return getFinalQueryResult(this.transformData, this.getRawData(), this.rootResultObject);
+  }
+}
+
+export class ResultMultiWrapper implements DataResult {
+  public constructor(private readonly results: ResultWrapper[], private rootResultObject: any) {
+  }
+
+  public async getFinalResult(): Promise<any> {
+    const [transformDataJson, rawDataRef, cleanResultList] = this.results.reduce<[Object[], any[], Object[]]>(
+      ([transformList, rawList, resultList], r) => {
+        transformList.push(r.getTransformData());
+        rawList.push(r.getRawData());
+        resultList.push(r.getRootResultObject());
+        return [transformList, rawList, resultList];
+      },
+      [[], [], []]
+    );
+
+    const responseDataObj = {
+      queryType: this.rootResultObject.queryType,
+      results: cleanResultList,
+      slowQuery: this.rootResultObject.slowQuery,
+    };
+
+    return getFinalQueryResultMulti(transformDataJson, rawDataRef, responseDataObj);
+  }
+}
+
+export class ResultArrayWrapper implements DataResult {
+  public constructor(private readonly results: ResultWrapper[]) {
+  }
+
+  public async getFinalResult(): Promise<any> {
+    const [transformDataJson, rawData, resultDataJson] = this.results.reduce<[Object[], any[], Object[]]>(
+      ([transformList, rawList, resultList], r) => {
+        transformList.push(r.getTransformData());
+        rawList.push(r.getRawData());
+        resultList.push(r.getRootResultObject());
+        return [transformList, rawList, resultList];
+      },
+      [[], [], []]
+    );
+
+    return getFinalQueryResultArray(transformDataJson, rawData, resultDataJson);
+  }
 }