make extend of all the things in the view

Author: KSDaemon

packages/cubejs-schema-compiler/src/compiler/CubeSymbols.ts

@@ -35,6 +35,12 @@ interface CubeDefinition {
   includedMembers?: any[];
 }
 
+interface CubeDefinitionExtended extends CubeDefinition {
+  allDefinitions: (type: string) => Record<string, any>;
+  rawFolders: () => any[];
+  rawCubes: () => any[];
+}
+
 interface SplitViews {
   [key: string]: any;
 }
@@ -102,7 +108,7 @@ export class CubeSymbols {
     }
   }
 
-  public getCubeDefinition(cubeName: string) {
+  public getCubeDefinition(cubeName: string): CubeDefinitionExtended {
     if (!this.builtCubes[cubeName]) {
       const cubeDefinition = this.cubeDefinitions[cubeName];
       this.builtCubes[cubeName] = this.createCube(cubeDefinition);
@@ -111,7 +117,7 @@ export class CubeSymbols {
     return this.builtCubes[cubeName];
   }
 
-  public createCube(cubeDefinition: CubeDefinition) {
+  public createCube(cubeDefinition: CubeDefinition): CubeDefinitionExtended {
     let preAggregations: any;
     let joins: any;
     let measures: any;
@@ -120,6 +126,7 @@ export class CubeSymbols {
     let hierarchies: any;
     let accessPolicy: any;
     let folders: any;
+    let cubes: any;
 
     const cubeObject = Object.assign({
       allDefinitions(type: string) {
@@ -149,6 +156,22 @@ export class CubeSymbols {
         return folders;
       },
 
+      // `Cubes` of a view are not a part of Cube Symbols,
+      // but views can extend other views, so we need the ability to access parent view's cubes.
+      rawCubes() {
+        if (!cubes) {
+          if (cubeDefinition.extends) {
+            cubes = [
+              ...super.rawCubes(),
+              ...(cubeDefinition.cubes || [])
+            ];
+          } else {
+            cubes = [...(cubeDefinition.cubes || [])];
+          }
+        }
+        return cubes;
+      },
+
       get preAggregations() {
         // For preAggregations order is important, and destructing parents cube pre-aggs first will lead to
         // unexpected results, so we can not use common approach with allDefinitions('preAggregations') here.
@@ -240,7 +263,7 @@ export class CubeSymbols {
     if (cubeDefinition.extends) {
       const superCube = this.resolveSymbolsCall(cubeDefinition.extends, (name: string) => this.cubeReferenceProxy(name));
       // eslint-disable-next-line no-underscore-dangle
-      const parentCube = superCube.__cubeName ? this.getCubeDefinition(superCube.__cubeName) : superCube;
+      const parentCube = superCube.__cubeName ? this.getCubeDefinition(superCube.__cubeName) : superCube as unknown as CubeDefinition;
       Object.setPrototypeOf(cubeObject, parentCube);
 
       // We have 2 different properties that are mutually exclusive: `sqlTable` & `sql`
@@ -303,7 +326,7 @@ export class CubeSymbols {
     };
   }
 
-  private camelCaseTypes(obj: Object) {
+  private camelCaseTypes(obj: Object | undefined) {
     if (!obj) {
       return;
     }
@@ -362,8 +385,9 @@ export class CubeSymbols {
     }
   }
 
-  protected prepareIncludes(cube: CubeDefinition, errorReporter: ErrorReporter, splitViews: SplitViews) {
-    if (!cube.cubes) {
+  protected prepareIncludes(cube: CubeDefinitionExtended, errorReporter: ErrorReporter, splitViews: SplitViews) {
+    const includedCubes = cube.rawCubes();
+    if (!includedCubes.length) {
       return;
     }
 
@@ -378,32 +402,31 @@ export class CubeSymbols {
 
     for (const type of types) {
       let cubeIncludes: any[] = [];
-      if (cube.cubes) {
-        // If the hierarchy is included all members from it should be included as well
-        // Extend `includes` with members from hierarchies that should be auto-included
-        const cubes = type === 'dimensions' ? cube.cubes.map((it) => {
-          // TODO recheck `it.joinPath` typing
-          const fullPath = this.evaluateReferences(null, it.joinPath as () => ToString, { collectJoinHints: true });
-          const split = fullPath.split('.');
-          const cubeRef = split[split.length - 1];
-
-          if (it.includes === '*') {
-            return it;
-          }
 
-          const currentCubeAutoIncludeMembers = Array.from(autoIncludeMembers)
-            .filter((path) => path.startsWith(`${cubeRef}.`))
-            .map((path) => path.split('.')[1])
-            .filter(memberName => !it.includes.find((include) => (include.name || include) === memberName));
+      // If the hierarchy is included all members from it should be included as well
+      // Extend `includes` with members from hierarchies that should be auto-included
+      const cubes = type === 'dimensions' ? includedCubes.map((it) => {
+        // TODO recheck `it.joinPath` typing
+        const fullPath = this.evaluateReferences(null, it.joinPath as () => ToString, { collectJoinHints: true });
+        const split = fullPath.split('.');
+        const cubeRef = split[split.length - 1];
 
-          return {
-            ...it,
-            includes: (it.includes || []).concat(currentCubeAutoIncludeMembers),
-          };
-        }) : cube.cubes;
+        if (it.includes === '*') {
+          return it;
+        }
 
-        cubeIncludes = this.membersFromCubes(cube, cubes, type, errorReporter, splitViews, memberSets) || [];
-      }
+        const currentCubeAutoIncludeMembers = Array.from(autoIncludeMembers)
+          .filter((path) => path.startsWith(`${cubeRef}.`))
+          .map((path) => path.split('.')[1])
+          .filter(memberName => !it.includes.find((include) => (include.name || include) === memberName));
+
+        return {
+          ...it,
+          includes: (it.includes || []).concat(currentCubeAutoIncludeMembers),
+        };
+      }) : includedCubes;
+
+      cubeIncludes = this.membersFromCubes(cube, cubes, type, errorReporter, splitViews, memberSets) || [];
 
       if (type === 'hierarchies') {
         for (const member of cubeIncludes) {
@@ -424,15 +447,15 @@ export class CubeSymbols {
       const includeMembers = this.generateIncludeMembers(cubeIncludes, cube.name, type);
       this.applyIncludeMembers(includeMembers, cube, type, errorReporter);
 
-      cube.includedMembers = [...(cube.includedMembers || []), ...Array.from(new Set(cubeIncludes.map((it: any) => {
+      cube.includedMembers = R.uniqWith(R.equals, [...(cube.includedMembers || []), ...Array.from(new Set(cubeIncludes.map((it: any) => {
         const split = it.member.split('.');
         const memberPath = this.pathFromArray([split[split.length - 2], split[split.length - 1]]);
         return {
           type,
           memberPath,
           name: it.name
         };
-      })))];
+      })))]);
     }
 
     [...memberSets.allMembers].filter(it => !memberSets.resolvedMembers.has(it)).forEach(it => {
@@ -451,7 +474,7 @@ export class CubeSymbols {
   }
 
   protected membersFromCubes(parentCube: CubeDefinition, cubes: any[], type: string, errorReporter: ErrorReporter, splitViews: SplitViews, memberSets: any) {
-    return R.unnest(cubes.map(cubeInclude => {
+    return R.uniqWith(R.equals, R.unnest(cubes.map(cubeInclude => {
       // TODO recheck `cubeInclude.joinPath` typing
       const fullPath = this.evaluateReferences(null, cubeInclude.joinPath as () => ToString, { collectJoinHints: true });
       const split = fullPath.split('.');
@@ -531,7 +554,7 @@ export class CubeSymbols {
       } else {
         return finalIncludes;
       }
-    }));
+    })));
   }
 
   protected diffByMember(includes: any[], excludes: any[]) {

packages/cubejs-schema-compiler/src/compiler/CubeValidator.ts

@@ -747,6 +747,7 @@ const baseSchema = {
   extends: Joi.func(),
   allDefinitions: Joi.func(), // Helpers function for extending
   rawFolders: Joi.func(), // Helpers function for extending
+  rawCubes: Joi.func(), // Helpers function for extending
   title: Joi.string(),
   sqlAlias: Joi.string(),
   dataSource: Joi.string(),