refactor ResultWrapper classes

Author: KSDaemon

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

@@ -12,6 +12,8 @@ export interface DataResult {
   getRawData(): any[];
   getTransformData(): any[];
   getRootResultObject(): any[];
+  // eslint-disable-next-line no-use-before-define
+  getResults(): ResultWrapper[];
 }
 
 class BaseWrapper {
@@ -159,15 +161,19 @@ export class ResultWrapper extends BaseWrapper implements DataResult {
   public async getFinalResult(): Promise<any> {
     return getFinalQueryResult(this.transformData, this.getRawData()[0], this.rootResultObject);
   }
+
+  public getResults(): ResultWrapper[] {
+    return [this];
+  }
 }
 
-export class ResultMultiWrapper extends BaseWrapper implements DataResult {
-  public constructor(private readonly results: ResultWrapper[], private rootResultObject: any) {
+class BaseWrapperArray extends BaseWrapper {
+  public constructor(protected readonly results: ResultWrapper[]) {
     super();
   }
 
-  public async getFinalResult(): Promise<any> {
-    const [transformDataJson, rawDataRef, cleanResultList] = this.results.reduce<[Object[], any[], Object[]]>(
+  protected getInternalDataArrays(): any[] {
+    const [transformDataJson, rawData, resultDataJson] = this.results.reduce<[Object[], any[], Object[]]>(
       ([transformList, rawList, resultList], r) => {
         transformList.push(r.getTransformData()[0]);
         rawList.push(r.getRawData()[0]);
@@ -177,13 +183,11 @@ export class ResultMultiWrapper extends BaseWrapper implements DataResult {
       [[], [], []]
     );
 
-    const responseDataObj = {
-      queryType: this.rootResultObject.queryType,
-      results: cleanResultList,
-      slowQuery: this.rootResultObject.slowQuery,
-    };
+    return [transformDataJson, rawData, resultDataJson];
+  }
 
-    return getFinalQueryResultMulti(transformDataJson, rawDataRef, responseDataObj);
+  public getResults(): ResultWrapper[] {
+    return this.results;
   }
 
   public getTransformData(): any[] {
@@ -199,38 +203,33 @@ export class ResultMultiWrapper extends BaseWrapper implements DataResult {
   }
 }
 
-// This is consumed by native side via Transport Bridge
-export class ResultArrayWrapper extends BaseWrapper implements DataResult {
-  public constructor(private readonly results: ResultWrapper[]) {
-    super();
+export class ResultMultiWrapper extends BaseWrapperArray implements DataResult {
+  public constructor(results: ResultWrapper[], private rootResultObject: any) {
+    super(results);
   }
 
   public async getFinalResult(): Promise<any> {
-    const [transformDataJson, rawData, resultDataJson] = this.results.reduce<[Object[], any[], Object[]]>(
-      ([transformList, rawList, resultList], r) => {
-        transformList.push(r.getTransformData()[0]);
-        rawList.push(r.getRawData()[0]);
-        resultList.push(r.getRootResultObject()[0]);
-        return [transformList, rawList, resultList];
-      },
-      [[], [], []]
-    );
+    const [transformDataJson, rawDataRef, cleanResultList] = this.getInternalDataArrays();
 
-    // It seems this is not needed anymore
-    // return getFinalQueryResultArray(transformDataJson, rawData, resultDataJson);
+    const responseDataObj = {
+      queryType: this.rootResultObject.queryType,
+      results: cleanResultList,
+      slowQuery: this.rootResultObject.slowQuery,
+    };
 
-    return [transformDataJson, rawData, resultDataJson];
+    return getFinalQueryResultMulti(transformDataJson, rawDataRef, responseDataObj);
   }
+}
 
-  public getTransformData(): any[] {
-    return this.results.map(r => r.getTransformData()[0]);
+// This is consumed by native side via Transport Bridge
+export class ResultArrayWrapper extends BaseWrapperArray implements DataResult {
+  public constructor(results: ResultWrapper[]) {
+    super(results);
   }
 
-  public getRawData(): any[] {
-    return this.results.map(r => r.getRawData()[0]);
-  }
+  public async getFinalResult(): Promise<any> {
+    const [transformDataJson, rawDataRef, cleanResultList] = this.getInternalDataArrays();
 
-  public getRootResultObject(): any[] {
-    return this.results.map(r => r.getRootResultObject()[0]);
+    return [transformDataJson, rawDataRef, cleanResultList];
   }
 }