chore(schema-compiler)!: Drop support for top-level includes/excludes in views

Author: KSDaemon

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

@@ -282,7 +282,7 @@ export class CubeSymbols {
   }
 
   protected prepareIncludes(cube: CubeDefinition, errorReporter: ErrorReporter, splitViews: SplitViews) {
-    if (!cube.includes && !cube.cubes) {
+    if (!cube.cubes) {
       return;
     }
 
@@ -324,18 +324,8 @@ export class CubeSymbols {
         cubeIncludes = this.membersFromCubes(cube, cubes, type, errorReporter, splitViews, memberSets) || [];
       }
 
-      // This is the deprecated approach
-      const includes = cube.includes && this.membersFromIncludeExclude(cube.includes, cube.name, type) || [];
-      const excludes = cube.excludes && this.membersFromIncludeExclude(cube.excludes, cube.name, type) || [];
-
-      // cube includes will take precedence in case of member clash
-      const finalIncludes = this.diffByMember(
-        this.diffByMember(includes, cubeIncludes).concat(cubeIncludes),
-        excludes
-      );
-
       if (type === 'hierarchies') {
-        for (const member of finalIncludes) {
+        for (const member of cubeIncludes) {
           const path = member.member.split('.');
           const cubeName = path[path.length - 2];
           const hierarchyName = path[path.length - 1];
@@ -350,10 +340,10 @@ export class CubeSymbols {
         }
       }
 
-      const includeMembers = this.generateIncludeMembers(finalIncludes, cube.name, type);
+      const includeMembers = this.generateIncludeMembers(cubeIncludes, cube.name, type);
       this.applyIncludeMembers(includeMembers, cube, type, errorReporter);
 
-      cube.includedMembers = [...(cube.includedMembers || []), ...Array.from(new Set(finalIncludes.map((it: any) => {
+      cube.includedMembers = [...(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 {
@@ -465,22 +455,6 @@ export class CubeSymbols {
     return includes.filter(include => !excludesMap.has(include.member));
   }
 
-  protected membersFromIncludeExclude(referencesFn: (...args: Array<unknown>) => Array<ToString>, cubeName: string, type: string) {
-    const references = this.evaluateReferences(cubeName, referencesFn);
-    return R.unnest(references.map((ref: string) => {
-      const path = ref.split('.');
-      if (path.length === 1) {
-        const membersObj = this.symbols[path[0]]?.cubeObj()?.[type] || {};
-        return Object.keys(membersObj).map(memberName => ({ member: `${ref}.${memberName}` }));
-      } else if (path.length === 2) {
-        const resolvedMember = this.getResolvedMember(type, path[0], path[1]);
-        return resolvedMember ? [{ member: ref }] : undefined;
-      } else {
-        throw new Error(`Unexpected path length ${path.length} for ${ref}`);
-      }
-    })).filter(Boolean);
-  }
-
   protected getResolvedMember(type: string, cubeName: string, memberName: string) {
     return this.symbols[cubeName]?.cubeObj()?.[type]?.[memberName];
   }

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

@@ -779,8 +779,6 @@ const cubeSchema = inherit(baseSchema, {
 
 const viewSchema = inherit(baseSchema, {
   isView: Joi.boolean().strict(),
-  includes: Joi.func(),
-  excludes: Joi.func(),
   cubes: Joi.array().items(
     Joi.object().keys({
       joinPath: Joi.func().required(),

packages/cubejs-schema-compiler/test/unit/views.test.ts

@@ -391,42 +391,6 @@ describe('Views YAML', () => {
     });
   });
 
-  it('includes * (legacy)', async () => {
-    const { cubeEvaluator } = await schemaCompile([{
-      name: 'simple_view',
-      includes: [
-        'CubeA.id',
-        // conflict
-        // 'CubeB.id',
-        'CubeB.other_id',
-      ]
-    }]);
-
-    expect(cubeEvaluator.getCubeDefinition('simple_view').dimensions).toEqual({
-      id: dimensionFixtureForCube('CubeA.id'),
-      other_id: dimensionFixtureForCube('CubeB.other_id'),
-    });
-  });
-
-  it('includes * (legacy) + exclude b.id', async () => {
-    const { cubeEvaluator } = await schemaCompile([{
-      name: 'simple_view',
-      includes: [
-        'CubeA.id',
-        'CubeB.id',
-        'CubeB.other_id',
-      ],
-      excludes: [
-        'CubeB.id'
-      ]
-    }]);
-
-    expect(cubeEvaluator.getCubeDefinition('simple_view').dimensions).toEqual({
-      id: dimensionFixtureForCube('CubeA.id'),
-      other_id: dimensionFixtureForCube('CubeB.other_id'),
-    });
-  });
-
   it('throws error for unresolved members', async () => {
     const { compiler } = prepareYamlCompiler(`
       cubes: