refactor ResultWrapper constructor

cube-js · Jan 10, 2025 · 5612755 · 5612755
1 parent 810808a
commit 5612755
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/cubejs-api-gateway/src/gateway.ts b/packages/cubejs-api-gateway/src/gateway.ts
@@ -1581,9 +1581,7 @@ class ApiGateway {
    * @private
    */
   private wrapAdapterQueryResultIfNeeded(res: any): ResultWrapper {
-    if (!(res.data instanceof ResultWrapper)) {
-      res.data = new ResultWrapper(null, res.data);
-    }
+    res.data = new ResultWrapper(res.data);
 
     return res;
   }

diff --git a/packages/cubejs-backend-native/js/ResultWrapper.ts b/packages/cubejs-backend-native/js/ResultWrapper.ts
@@ -24,15 +24,26 @@ export class ResultWrapper extends BaseWrapper implements DataResult {
 
   private readonly isNative: Boolean = false;
 
+  private readonly nativeReference: any;
+
+  private readonly jsResult: any = null;
+
   private transformData: any;
 
   private rootResultObject: any = {};
 
-  public constructor(private readonly nativeReference: any, private readonly jsResult: any = null) {
+  public constructor(input: any) {
     super();
 
-    if (nativeReference) {
+    if (input.isWrapper) {
+      return input;
+    }
+
+    if (Array.isArray(input)) {
+      this.jsResult = input;
+    } else {
       this.isNative = true;
+      this.nativeReference = input;
     }
 
     this.proxy = new Proxy(this, {