fix: model style guide, views folder (#6493)

Author: vasilev-alex

packages/cubejs-api-gateway/src/gateway.ts

@@ -303,10 +303,6 @@ class ApiGateway {
       });
     }));
 
-    /** **************************************************************
-     * Meta scope                                                    *
-     *************************************************************** */
-
     app.get(
       `${this.basePath}/v1/meta`,
       userMiddlewares,

packages/cubejs-api-gateway/test/auth.test.ts

@@ -128,9 +128,8 @@ describe('test authorization', () => {
       .get('/test-auth-fake')
       .set('Authorization', `Authorization: ${badToken}`)
       .expect(403);
-
-    // No bad logs
-    expect(loggerMock.mock.calls.length).toEqual(0);
+      
+    expect(loggerMock.mock.calls.length).toEqual(3);
     expect(handlerMock.mock.calls.length).toEqual(2);
 
     expectSecurityContext(handlerMock.mock.calls[0][0].context.securityContext);

packages/cubejs-backend-shared/src/FileRepository.ts

@@ -22,8 +22,14 @@ export class FileRepository implements SchemaFileRepository {
     return path.join(process.cwd(), this.repositoryPath);
   }
 
-  protected async getFiles(dir: string, fileList: string[] = []) {
-    const files = await fs.readdir(path.join(this.localPath(), dir));
+  protected async getFiles(dir: string, fileList: string[] = []): Promise<string[]> {
+    let files: string[] = [];
+    
+    try {
+      files = await fs.readdir(path.join(this.localPath(), dir));
+    } catch (e) {
+      throw new Error(`Model files not found. Please make sure the "${this.repositoryPath}" directory exists and contains model files.`);
+    }
 
     // eslint-disable-next-line no-restricted-syntax
     for (const file of files) {

packages/cubejs-backend-shared/src/env.ts

@@ -1528,6 +1528,10 @@ const variables: Record<string, (...args: any) => any> = {
     return undefined;
   },
   pgSqlPort: () => {
+    if (process.env.CUBEJS_PG_SQL_PORT === 'false') {
+      return undefined;
+    }
+    
     const port = asFalseOrPort(process.env.CUBEJS_PG_SQL_PORT || 'false', 'CUBEJS_PG_SQL_PORT');
     if (port) {
       return port;

packages/cubejs-cli/src/templates.ts

@@ -206,7 +206,7 @@ const ordersJs = `cube(\`Orders\`, {
   \`,
 
   preAggregations: {
-    // Pre-Aggregations definitions go here
+    // Pre-aggregation definitions go here
     // Learn more here: https://cube.dev/docs/caching/pre-aggregations/getting-started
   },
 

packages/cubejs-playground/src/pages/Index/IndexPage.tsx

@@ -15,6 +15,12 @@ export function IndexPage() {
       const res = await fetch('/playground/files');
       const result = await res.json();
 
+      if (result.error?.includes('Model files not found')) {
+        setFiles([]);
+      } else if (result.error) {
+        throw result.error;
+      }
+
       if (isMounted()) {
         setFiles(result.files);
       }

packages/cubejs-schema-compiler/src/scaffolding/formatters/BaseSchemaFormatter.ts

@@ -106,7 +106,14 @@ export abstract class BaseSchemaFormatter {
     const table = `${
       tableSchema.schema?.length ? `${this.escapeName(tableSchema.schema)}.` : ''
     }${this.escapeName(tableSchema.table)}`;
-
+    
+    const { dataSource, ...contextProps } = schemaContext;
+      
+    let dataSourceProp = {};
+    if (dataSource) {
+      dataSourceProp = this.options.snakeCase ? { data_source: dataSource } : { dataSource };
+    }
+      
     const sqlOption = this.options.snakeCase
       ? {
         sql_table: table,
@@ -118,10 +125,12 @@ export abstract class BaseSchemaFormatter {
     return {
       cube: tableSchema.cube,
       ...sqlOption,
+      ...dataSourceProp,
+      
       [this.options.snakeCase ? 'pre_aggregations' : 'preAggregations']: new ValueWithComments(
         null,
         [
-          'Pre-Aggregations definitions go here',
+          'Pre-aggregation definitions go here',
           'Learn more here: https://cube.dev/docs/caching/pre-aggregations/getting-started',
         ]
       ),
@@ -164,9 +173,9 @@ export abstract class BaseSchemaFormatter {
         .reduce((a, b) => ({ ...a, ...b }), {}),
       ...(this.options.snakeCase
         ? Object.fromEntries(
-          Object.entries(schemaContext).map(([key, value]) => [toSnakeCase(key), value])
+          Object.entries(contextProps).map(([key, value]) => [toSnakeCase(key), value])
         )
-        : schemaContext),
+        : contextProps),
     };
   }
 
@@ -196,10 +205,6 @@ export abstract class BaseSchemaFormatter {
         }
       );
 
-      const dimensionNames = cubeMembers.dimensions
-        .filter((d) => d.included || d.included == null)
-        .map((d) => d.name);
-
       return {
         ...generatedDescriptor,
         ...descriptor,

packages/cubejs-schema-compiler/src/scaffolding/formatters/JavaScriptSchemaFormatter.ts

@@ -18,8 +18,7 @@ export class JavaScriptSchemaFormatter extends BaseSchemaFormatter {
   }
 
   protected render(descriptor: SchemaDescriptor, level: number, appendComment = ''): string {
-    // eslint-disable-next-line prefer-template
-    const lineSeparator = ',\n' + (level < 2 ? '\n' : '');
+    const lineSeparator = `,\n${level < 2 ? '\n' : ''}`;
 
     if (Array.isArray(descriptor)) {
       const items = descriptor.map(desc => this.render(desc, level + 1)).join(', ');

packages/cubejs-schema-compiler/src/scaffolding/formatters/YamlSchemaFormatter.ts

@@ -47,7 +47,7 @@ export class YamlSchemaFormatter extends BaseSchemaFormatter {
     } else if (value instanceof ValueWithComments) {
       const comments = `\n${value.comments
         .map((comment) => `${indent}# ${comment}`)
-        .join('\n')}`;
+        .join('\n')}\n`;
 
       return value.value ? `${this.render(value.value)}${comments}` : comments;
     } else if (Array.isArray(value)) {
@@ -56,7 +56,7 @@ export class YamlSchemaFormatter extends BaseSchemaFormatter {
           (v) => typeof v !== 'object' || v instanceof MemberReference
         )
       ) {
-        return ` [${value.map(this.render).join(', ')}]`;
+        return ` [${value.map(this.render).join(', ')}]\n`;
       }
 
       return `\n${value
@@ -70,17 +70,19 @@ export class YamlSchemaFormatter extends BaseSchemaFormatter {
               Array.isArray(parent) && index === 0 ? '' : `${indent}`
             }${k}:${this.render(v, level + 1, value)}`
           )
-          .join('\n')}`;
+          .join('\n')}\n`;
       }
 
+      const newLineKeys = Object.keys(value).includes('data_source') ? ['data_source'] : ['sql_table'];
       const content = Object.keys(value)
         .map((key) => {
           if (!isPlainObject(value[key])) {
+            const newLine = newLineKeys.includes(key) ? '\n' : '';
             return `${indent}${key}:${this.render(
               value[key],
               level + 1,
               value
-            )}`;
+            )}${newLine}`;
           }
 
           return `${indent}${key}:${this.render(