chore: data model style updates (#6644)

* chore: data model style updates

* fixes

Author: vasilev-alex

packages/cubejs-cli/src/templates.ts

@@ -218,8 +218,8 @@ const ordersJs = `cube(\`orders\`, {
   \`,
 
   pre_aggregations: {
-    // Pre-aggregation definitions go here
-    // Learn more here: https://cube.dev/docs/caching/pre-aggregations/getting-started
+    // Pre-aggregation definitions go here.
+    // Learn more in the documentation: https://cube.dev/docs/caching/pre-aggregations/getting-started
   },
 
   measures: {
@@ -287,8 +287,8 @@ const ordersYml = `cubes:
       UNION ALL
       SELECT 5 AS id, 600 AS amount, 'shipped' status
 
-    # Pre-aggregation definitions go here
-    # Learn more here: https://cube.dev/docs/caching/pre-aggregations/getting-started
+    # Pre-aggregation definitions go here.
+    # Learn more in the documentation: https://cube.dev/docs/caching/pre-aggregations/getting-started
     # pre_aggregations:
 
     measures:

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

@@ -127,13 +127,6 @@ export abstract class BaseSchemaFormatter {
       ...sqlOption,
       ...dataSourceProp,
 
-      [this.options.snakeCase ? 'pre_aggregations' : 'preAggregations']: new ValueWithComments(
-        null,
-        [
-          'Pre-aggregation definitions go here',
-          'Learn more here: https://cube.dev/docs/caching/pre-aggregations/getting-started',
-        ]
-      ),
       joins: tableSchema.joins
         .map((j) => ({
           [j.cubeToJoin]: {
@@ -146,36 +139,45 @@ export abstract class BaseSchemaFormatter {
           },
         }))
         .reduce((a, b) => ({ ...a, ...b }), {}),
-      measures: tableSchema.measures
+      dimensions: tableSchema.dimensions
         .map((m) => ({
           [this.memberName(m)]: {
             sql: this.sqlForMember(m),
             type: m.type ?? m.types[0],
             title: this.memberTitle(m),
+            [this.options.snakeCase ? 'primary_key' : 'primaryKey']: m.isPrimaryKey
+              ? true
+              : undefined,
           },
         }))
-        .reduce((a, b) => ({ ...a, ...b }), {
-          count: {
-            type: 'count',
-          },
-        }),
-      dimensions: tableSchema.dimensions
+        .reduce((a, b) => ({ ...a, ...b }), {}),
+      measures: tableSchema.measures
         .map((m) => ({
           [this.memberName(m)]: {
             sql: this.sqlForMember(m),
             type: m.type ?? m.types[0],
             title: this.memberTitle(m),
-            [this.options.snakeCase ? 'primary_key' : 'primaryKey']: m.isPrimaryKey
-              ? true
-              : undefined,
           },
         }))
-        .reduce((a, b) => ({ ...a, ...b }), {}),
+        .reduce((a, b) => ({ ...a, ...b }), {
+          count: {
+            type: 'count',
+          },
+        }),
+        
       ...(this.options.snakeCase
         ? Object.fromEntries(
           Object.entries(contextProps).map(([key, value]) => [toSnakeCase(key), value])
         )
         : contextProps),
+
+      [this.options.snakeCase ? 'pre_aggregations' : 'preAggregations']: new ValueWithComments(
+        null,
+        [
+          'Pre-aggregation definitions go here.',
+          'Learn more in the documentation: https://cube.dev/docs/caching/pre-aggregations/getting-started',
+        ]
+      ),
     };
   }