chore: Update to views spec (#6518)

* chore: Update to spec views

* fixes

Author: keydunov

packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.js

@@ -196,23 +196,23 @@ export class CubeEvaluator extends CubeSymbols {
       const fullPath = this.evaluateReferences(null, cubeInclude.cube, { collectJoinHints: true });
       const split = fullPath.split('.');
       const cubeReference = split[split.length - 1];
-      const cubeName = cubeInclude.name || cubeReference;
+      const cubeName = cubeInclude.alias || cubeReference;
       let includes;
       if (cubeInclude.includes === '*') {
         const membersObj = this.symbols[cubeReference]?.cubeObj()?.[type] || {};
         includes = Object.keys(membersObj).map(memberName => ({ member: `${fullPath}.${memberName}` }));
       } else {
         includes = cubeInclude.includes.map(include => {
-          const member = include.member || include;
+          const member = include.alias || include;
           if (member.indexOf('.') !== -1) {
             errorReporter.error(`Paths aren't allowed in cube includes but '${member}' provided as include member`);
           }
-          let name = include.name || member;
+          let name = include.alias || member;
           name = cubeInclude.prefix ? `${cubeName}_${name}` : name;
-          if (include.member) {
-            const resolvedMember = this.symbols[cubeReference]?.cubeObj()?.[type]?.[include.member];
+          if (include.name) {
+            const resolvedMember = this.symbols[cubeReference]?.cubeObj()?.[type]?.[include.name];
             return resolvedMember ? {
-              member: `${fullPath}.${include.member}`,
+              member: `${fullPath}.${include.name}`,
               name,
             } : undefined;
           } else {

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

@@ -541,14 +541,14 @@ const viewSchema = inherit(baseSchema, {
     Joi.object().keys({
       cube: Joi.func().required(),
       prefix: Joi.boolean(),
-      name: Joi.string(),
+      alias: Joi.string(),
       includes: Joi.alternatives([
         Joi.string().valid('*'),
         Joi.array().items(Joi.alternatives([
           Joi.string().required(),
           Joi.object().keys({
-            member: Joi.string().required(),
-            name: Joi.string()
+            name: Joi.string().required(),
+            alias: Joi.string()
           })
         ]))
       ]).required(),

packages/cubejs-schema-compiler/test/integration/postgres/yaml-compiler.test.ts

@@ -346,22 +346,26 @@ cubes:
         
 views:
   - name: orders_view
+
     cubes:
       - cube: orders
         prefix: true
         includes:
           - count
-          - member: time
-            name: date
+          - name: time
+            alias: date
+
       - cube: orders.customers
+        alias: aliased_customers
+        prefix: true
         includes:
           - name
     `);
     await compiler.compile();
 
     const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
       measures: ['orders_view.orders_count'],
-      dimensions: ['orders_view.name'],
+      dimensions: ['orders_view.aliased_customers_name'],
       timeDimensions: [{
         dimension: 'orders_view.orders_date',
         granularity: 'day',
@@ -374,12 +378,13 @@ views:
     console.log(query.buildSqlAndParams());
 
     const res = await dbRunner.evaluateQueryWithPreAggregations(query);
+
     console.log(JSON.stringify(res));
 
     expect(res).toEqual(
       [{
         orders_view__orders_count: '1',
-        orders_view__name: 'Foo',
+        orders_view__aliased_customers_name: 'Foo',
         orders_view__orders_date_day: '2022-01-01T00:00:00.000Z',
       }]
     );