@lightdash/common 1.119.0 → 1.120.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/dist/cjs/.tsbuildinfo +1 -1
  2. package/dist/cjs/dbt/validation.test.js +8 -0
  3. package/dist/cjs/dbt/validation.test.js.map +1 -1
  4. package/dist/cjs/preAggregates/definition.d.ts.map +1 -1
  5. package/dist/cjs/preAggregates/definition.js +42 -0
  6. package/dist/cjs/preAggregates/definition.js.map +1 -1
  7. package/dist/cjs/preAggregates/definition.test.js +115 -0
  8. package/dist/cjs/preAggregates/definition.test.js.map +1 -1
  9. package/dist/cjs/preAggregates/schema.test.d.ts +2 -0
  10. package/dist/cjs/preAggregates/schema.test.d.ts.map +1 -0
  11. package/dist/cjs/preAggregates/schema.test.js +173 -0
  12. package/dist/cjs/preAggregates/schema.test.js.map +1 -0
  13. package/dist/cjs/schemas/json/lightdash-dbt-2.0.json +29 -0
  14. package/dist/cjs/schemas/json/model-as-code-1.0.json +29 -0
  15. package/dist/cjs/types/dbt.d.ts +5 -4
  16. package/dist/cjs/types/dbt.d.ts.map +1 -1
  17. package/dist/cjs/types/dbt.js.map +1 -1
  18. package/dist/cjs/types/preAggregate.d.ts +3 -1
  19. package/dist/cjs/types/preAggregate.d.ts.map +1 -1
  20. package/dist/cjs/types/preAggregate.js.map +1 -1
  21. package/dist/esm/.tsbuildinfo +1 -1
  22. package/dist/esm/dbt/validation.test.js +7 -0
  23. package/dist/esm/dbt/validation.test.js.map +1 -1
  24. package/dist/esm/preAggregates/definition.d.ts.map +1 -1
  25. package/dist/esm/preAggregates/definition.js +42 -0
  26. package/dist/esm/preAggregates/definition.js.map +1 -1
  27. package/dist/esm/preAggregates/definition.test.js +115 -0
  28. package/dist/esm/preAggregates/definition.test.js.map +1 -1
  29. package/dist/esm/preAggregates/schema.test.d.ts +2 -0
  30. package/dist/esm/preAggregates/schema.test.d.ts.map +1 -0
  31. package/dist/esm/preAggregates/schema.test.js +170 -0
  32. package/dist/esm/preAggregates/schema.test.js.map +1 -0
  33. package/dist/esm/schemas/json/lightdash-dbt-2.0.json +29 -0
  34. package/dist/esm/schemas/json/model-as-code-1.0.json +29 -0
  35. package/dist/esm/types/dbt.d.ts +5 -4
  36. package/dist/esm/types/dbt.d.ts.map +1 -1
  37. package/dist/esm/types/dbt.js.map +1 -1
  38. package/dist/esm/types/preAggregate.d.ts +3 -1
  39. package/dist/esm/types/preAggregate.d.ts.map +1 -1
  40. package/dist/esm/types/preAggregate.js.map +1 -1
  41. package/dist/types/.tsbuildinfo +1 -1
  42. package/dist/types/dbt/validation.test.js +7 -0
  43. package/dist/types/dbt/validation.test.js.map +1 -1
  44. package/dist/types/preAggregates/definition.d.ts.map +1 -1
  45. package/dist/types/preAggregates/definition.js +42 -0
  46. package/dist/types/preAggregates/definition.js.map +1 -1
  47. package/dist/types/preAggregates/definition.test.js +115 -0
  48. package/dist/types/preAggregates/definition.test.js.map +1 -1
  49. package/dist/types/preAggregates/schema.test.d.ts +2 -0
  50. package/dist/types/preAggregates/schema.test.d.ts.map +1 -0
  51. package/dist/types/preAggregates/schema.test.js +170 -0
  52. package/dist/types/preAggregates/schema.test.js.map +1 -0
  53. package/dist/types/schemas/json/lightdash-dbt-2.0.json +29 -0
  54. package/dist/types/schemas/json/model-as-code-1.0.json +29 -0
  55. package/dist/types/types/dbt.d.ts +5 -4
  56. package/dist/types/types/dbt.d.ts.map +1 -1
  57. package/dist/types/types/dbt.js.map +1 -1
  58. package/dist/types/types/preAggregate.d.ts +3 -1
  59. package/dist/types/types/preAggregate.d.ts.map +1 -1
  60. package/dist/types/types/preAggregate.js.map +1 -1
  61. package/package.json +1 -1
@@ -1,5 +1,6 @@
1
1
  import { model } from '../compiler/translator.mock';
2
2
  import { DbtManifestVersion } from '../types/dbt';
3
+ import lightdashMetadataSchema from './schemas/lightdashMetadata.json';
3
4
  import { ManifestValidator } from './validation';
4
5
  const metadataSchemaId = 'https://schemas.lightdash.com/lightdash/metadata.json';
5
6
  const defaultTimeDimensionValidator = ManifestValidator.getValidator(`${metadataSchemaId}#/definitions/DefaultTimeDimension`);
@@ -59,6 +60,12 @@ describe('DefaultTimeDimension metadata schema', () => {
59
60
  })).toEqual([true, undefined]);
60
61
  });
61
62
  });
63
+ describe('pre-aggregate manifest validation boundary', () => {
64
+ test('keeps runtime parsing responsible while metadata schema omits pre-aggregates', () => {
65
+ expect(lightdashMetadataSchema.definitions.LightdashModelMetadata
66
+ .properties).not.toHaveProperty('pre_aggregates');
67
+ });
68
+ });
62
69
  describe('AI hint manifest compatibility', () => {
63
70
  test('does not invalidate an explore with malformed optional hints', () => {
64
71
  const malformedHint = { Formula: 'clicks + keys' };
@@ -1 +1 @@
1
- {"version":3,"file":"validation.test.js","sourceRoot":"","sources":["../../../src/dbt/validation.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.test.js","sourceRoot":"","sources":["../../../src/dbt/validation.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../../src/preAggregates/definition.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,KAAK,EACR,eAAe,EAElB,MAAM,uBAAuB,CAAC;AAuH/B,eAAO,MAAM,uBAAuB,iBAClB,kBAAkB,GAAG,OAAO,aAC/B,MAAM,KAClB,eA6FF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACf,OAAO,aACX,MAAM,KAClB,eAAe,EAYjB,CAAC"}
1
+ {"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../../src/preAggregates/definition.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,KAAK,EACR,eAAe,EAGlB,MAAM,uBAAuB,CAAC;AA4L/B,eAAO,MAAM,uBAAuB,iBAClB,kBAAkB,GAAG,OAAO,aAC/B,MAAM,KAClB,eAmGF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACf,OAAO,aACX,MAAM,KAClB,eAAe,EAYjB,CAAC"}
@@ -7,6 +7,7 @@ import { ParseError } from '../types/errors';
7
7
  import { parseFilters } from '../types/filterGrammar';
8
8
  import { TimeFrames } from '../types/timeFrames';
9
9
  const PRE_AGGREGATE_NAME_PATTERN = /^[a-zA-Z0-9_]+$/;
10
+ const isUnknownRecord = (value) => isPlainObject(value);
10
11
  const parsePreAggregateGranularity = (granularity, modelName, preAggregateName) => {
11
12
  const normalized = granularity.trim().toUpperCase();
12
13
  if (!Object.values(TimeFrames).includes(normalized)) {
@@ -25,6 +26,43 @@ const parsePreAggregateStringArray = (value, fieldName, modelName, preAggregateN
25
26
  return item.trim();
26
27
  });
27
28
  };
29
+ const parsePreAggregateSorts = (value, modelName, preAggregateName) => {
30
+ if (value === false) {
31
+ return [];
32
+ }
33
+ if (!Array.isArray(value)) {
34
+ throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts". Expected an array of sort entries, or false / [] to disable materialization sorting, or remove "sorts" for automatic sorting.`);
35
+ }
36
+ const fieldIds = new Set();
37
+ return value.map((sort, index) => {
38
+ if (!isUnknownRecord(sort)) {
39
+ throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}. Expected an object.`);
40
+ }
41
+ const { fieldId, descending, ...unknownFields } = sort;
42
+ const unsupportedFields = Object.keys(unknownFields);
43
+ if (unsupportedFields.length > 0) {
44
+ throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has unsupported "sorts" fields: ${unsupportedFields.join(', ')}`);
45
+ }
46
+ if (typeof fieldId !== 'string' || fieldId.trim().length === 0) {
47
+ throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}: "fieldId" must be a non-empty string.`);
48
+ }
49
+ const normalizedFieldId = fieldId.trim();
50
+ if (fieldIds.has(normalizedFieldId)) {
51
+ throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has duplicate "sorts" fieldId "${normalizedFieldId}".`);
52
+ }
53
+ fieldIds.add(normalizedFieldId);
54
+ if (descending === undefined) {
55
+ throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}: "descending" is required.`);
56
+ }
57
+ if (typeof descending !== 'boolean') {
58
+ throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}: "descending" must be a boolean.`);
59
+ }
60
+ return {
61
+ fieldId: normalizedFieldId,
62
+ descending,
63
+ };
64
+ });
65
+ };
28
66
  const parseMaterializationRoleAttributes = (value, modelName, preAggregateName) => {
29
67
  if (!isPlainObject(value) || isEmpty(value)) {
30
68
  throw new ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "materialization_role.attributes". Expected a non-empty object.`);
@@ -94,6 +132,9 @@ export const parseDbtPreAggregateDef = (preAggregate, modelName) => {
94
132
  const materializationRole = safePreAggregate?.materialization_role !== undefined
95
133
  ? parseMaterializationRole(safePreAggregate.materialization_role, modelName, name)
96
134
  : undefined;
135
+ const sorts = safePreAggregate?.sorts !== undefined
136
+ ? parsePreAggregateSorts(safePreAggregate.sorts, modelName, name)
137
+ : undefined;
97
138
  const filters = safePreAggregate?.filters
98
139
  ? parseFilters(safePreAggregate.filters)
99
140
  : undefined;
@@ -101,6 +142,7 @@ export const parseDbtPreAggregateDef = (preAggregate, modelName) => {
101
142
  name,
102
143
  dimensions,
103
144
  metrics,
145
+ ...(sorts !== undefined ? { sorts } : {}),
104
146
  ...(filters ? { filters } : {}),
105
147
  ...(timeDimension ? { timeDimension } : {}),
106
148
  ...(granularity ? { granularity } : {}),
@@ -1 +1 @@
1
- {"version":3,"file":"definition.js","sourceRoot":"","sources":["../../../src/preAggregates/definition.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"definition.js","sourceRoot":"","sources":["../../../src/preAggregates/definition.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,121 @@ describe('parseDbtPreAggregateDef', () => {
8
8
  dimensions: ['order_date'],
9
9
  metrics: ['order_count'],
10
10
  };
11
+ it('parses canonical materialization sorts in order', () => {
12
+ expect(parseDbtPreAggregateDef({
13
+ ...basePreAggregate,
14
+ sorts: [
15
+ {
16
+ fieldId: ' orders_order_date_day ',
17
+ descending: true,
18
+ },
19
+ { fieldId: 'orders_status', descending: false },
20
+ ],
21
+ }, 'orders')).toEqual({
22
+ ...basePreAggregate,
23
+ sorts: [
24
+ {
25
+ fieldId: 'orders_order_date_day',
26
+ descending: true,
27
+ },
28
+ { fieldId: 'orders_status', descending: false },
29
+ ],
30
+ });
31
+ });
32
+ it('omits materialization sorts when they are not configured', () => {
33
+ expect(parseDbtPreAggregateDef(basePreAggregate, 'orders')).not.toHaveProperty('sorts');
34
+ });
35
+ it.each([
36
+ { name: 'false', sorts: false },
37
+ { name: 'an empty array', sorts: [] },
38
+ ])('normalizes $name to disabled materialization sorts', ({ sorts }) => {
39
+ expect(parseDbtPreAggregateDef({
40
+ ...basePreAggregate,
41
+ sorts,
42
+ }, 'orders')).toHaveProperty('sorts', []);
43
+ });
44
+ it.each([
45
+ {
46
+ name: 'true',
47
+ sorts: true,
48
+ message: 'Expected an array of sort entries, or false / []',
49
+ },
50
+ {
51
+ name: 'null',
52
+ sorts: null,
53
+ message: 'Expected an array of sort entries, or false / []',
54
+ },
55
+ {
56
+ name: 'a non-object entry',
57
+ sorts: [null],
58
+ message: 'Expected an object',
59
+ },
60
+ {
61
+ name: 'the old field key',
62
+ sorts: [{ field: 'order_date', descending: true }],
63
+ message: 'has unsupported "sorts" fields: field',
64
+ },
65
+ {
66
+ name: 'a missing fieldId',
67
+ sorts: [{ descending: false }],
68
+ message: '"fieldId" must be a non-empty string',
69
+ },
70
+ {
71
+ name: 'an empty fieldId',
72
+ sorts: [{ fieldId: '', descending: false }],
73
+ message: '"fieldId" must be a non-empty string',
74
+ },
75
+ {
76
+ name: 'a missing direction',
77
+ sorts: [{ fieldId: 'orders_order_date_day' }],
78
+ message: '"descending" is required',
79
+ },
80
+ {
81
+ name: 'an invalid direction',
82
+ sorts: [
83
+ {
84
+ fieldId: 'orders_order_date_day',
85
+ descending: 'yes',
86
+ },
87
+ ],
88
+ message: '"descending" must be a boolean',
89
+ },
90
+ {
91
+ name: 'a misspelled direction',
92
+ sorts: [
93
+ {
94
+ fieldId: 'orders_order_date_day',
95
+ descending: true,
96
+ desceding: false,
97
+ },
98
+ ],
99
+ message: 'has unsupported "sorts" fields: desceding',
100
+ },
101
+ {
102
+ name: 'unsupported null ordering',
103
+ sorts: [
104
+ {
105
+ fieldId: 'orders_order_date_day',
106
+ descending: true,
107
+ nulls_first: true,
108
+ },
109
+ ],
110
+ message: 'has unsupported "sorts" fields: nulls_first',
111
+ },
112
+ {
113
+ name: 'a duplicate fieldId',
114
+ sorts: [
115
+ { fieldId: 'orders_status', descending: false },
116
+ { fieldId: ' orders_status ', descending: true },
117
+ ],
118
+ message: 'has duplicate "sorts" fieldId "orders_status"',
119
+ },
120
+ ])('rejects $name in materialization sorts', ({ sorts, message }) => {
121
+ expect(() => parseDbtPreAggregateDef({
122
+ ...basePreAggregate,
123
+ sorts,
124
+ }, 'orders')).toThrow(message);
125
+ });
11
126
  it('parses materialization_role and normalizes scalar attributes to arrays', () => {
12
127
  const result = parseDbtPreAggregateDef({
13
128
  ...basePreAggregate,
@@ -1 +1 @@
1
- {"version":3,"file":"definition.test.js","sourceRoot":"","sources":["../../../src/preAggregates/definition.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"definition.test.js","sourceRoot":"","sources":["../../../src/preAggregates/definition.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=schema.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"schema.test.d.ts","sourceRoot":"","sources":["../../../src/preAggregates/schema.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,170 @@
1
+ import Ajv from 'ajv';
2
+ import AjvErrors from 'ajv-errors';
3
+ import addFormats from 'ajv-formats';
4
+ import lightdashDbtYamlSchema from '../schemas/json/lightdash-dbt-2.0.json';
5
+ import modelAsCodeSchema from '../schemas/json/model-as-code-1.0.json';
6
+ const dbtYamlAjv = new Ajv({
7
+ allErrors: true,
8
+ allowUnionTypes: true,
9
+ coerceTypes: true,
10
+ });
11
+ AjvErrors(dbtYamlAjv);
12
+ const modelYamlAjv = new Ajv({
13
+ allErrors: true,
14
+ allowUnionTypes: true,
15
+ coerceTypes: true,
16
+ discriminator: true,
17
+ });
18
+ addFormats(modelYamlAjv);
19
+ const validateDbtYaml = dbtYamlAjv.compile(lightdashDbtYamlSchema);
20
+ const validateModelYaml = modelYamlAjv.compile(modelAsCodeSchema);
21
+ const basePreAggregate = {
22
+ name: 'orders_rollup',
23
+ dimensions: ['status'],
24
+ metrics: ['order_count'],
25
+ };
26
+ const validateInBothSchemas = (preAggregate, expected) => {
27
+ const dbtDocument = {
28
+ version: 2,
29
+ models: [
30
+ {
31
+ name: 'orders',
32
+ meta: { pre_aggregates: [preAggregate] },
33
+ },
34
+ ],
35
+ };
36
+ const modelDocument = {
37
+ type: 'model',
38
+ name: 'orders',
39
+ sql_from: 'analytics.orders',
40
+ dimensions: [
41
+ {
42
+ name: 'status',
43
+ type: 'string',
44
+ sql: '${TABLE}.status',
45
+ },
46
+ ],
47
+ pre_aggregates: [preAggregate],
48
+ };
49
+ expect(validateDbtYaml(dbtDocument)).toBe(expected);
50
+ expect(validateModelYaml(modelDocument)).toBe(expected);
51
+ };
52
+ describe('pre-aggregate sort schema parity', () => {
53
+ it('keeps the dbt and model-as-code sort contracts identical', () => {
54
+ const dbtSortSchema = lightdashDbtYamlSchema.$defs.modelMeta.properties.pre_aggregates
55
+ .items.properties.sorts;
56
+ const modelSortSchema = modelAsCodeSchema.definitions.BaseModel.properties.pre_aggregates
57
+ .items.properties.sorts;
58
+ expect(dbtSortSchema).toStrictEqual(modelSortSchema);
59
+ });
60
+ it.each([
61
+ {
62
+ name: 'canonical sorts',
63
+ preAggregate: {
64
+ ...basePreAggregate,
65
+ sorts: [
66
+ { fieldId: 'orders_status', descending: false },
67
+ {
68
+ fieldId: 'orders_order_date_day',
69
+ descending: true,
70
+ },
71
+ ],
72
+ },
73
+ valid: true,
74
+ },
75
+ {
76
+ name: 'disabled sorts with false',
77
+ preAggregate: { ...basePreAggregate, sorts: false },
78
+ valid: true,
79
+ },
80
+ {
81
+ name: 'disabled sorts with an empty array',
82
+ preAggregate: { ...basePreAggregate, sorts: [] },
83
+ valid: true,
84
+ },
85
+ {
86
+ name: 'omitted sorts',
87
+ preAggregate: basePreAggregate,
88
+ valid: true,
89
+ },
90
+ {
91
+ name: 'a non-object entry',
92
+ preAggregate: {
93
+ ...basePreAggregate,
94
+ sorts: [null],
95
+ },
96
+ valid: false,
97
+ },
98
+ {
99
+ name: 'a missing fieldId',
100
+ preAggregate: {
101
+ ...basePreAggregate,
102
+ sorts: [{ descending: false }],
103
+ },
104
+ valid: false,
105
+ },
106
+ {
107
+ name: 'a missing descending value',
108
+ preAggregate: {
109
+ ...basePreAggregate,
110
+ sorts: [{ fieldId: 'orders_status' }],
111
+ },
112
+ valid: false,
113
+ },
114
+ {
115
+ name: 'a non-boolean descending value',
116
+ preAggregate: {
117
+ ...basePreAggregate,
118
+ sorts: [{ fieldId: 'orders_status', descending: 'yes' }],
119
+ },
120
+ valid: false,
121
+ },
122
+ {
123
+ name: 'a quoted boolean descending value',
124
+ preAggregate: {
125
+ ...basePreAggregate,
126
+ sorts: [{ fieldId: 'orders_status', descending: 'true' }],
127
+ },
128
+ valid: false,
129
+ },
130
+ {
131
+ name: 'the old field key',
132
+ preAggregate: {
133
+ ...basePreAggregate,
134
+ sorts: [{ field: 'status', descending: false }],
135
+ },
136
+ valid: false,
137
+ },
138
+ {
139
+ name: 'a misspelled desceding key',
140
+ preAggregate: {
141
+ ...basePreAggregate,
142
+ sorts: [
143
+ {
144
+ fieldId: 'orders_status',
145
+ descending: false,
146
+ desceding: true,
147
+ },
148
+ ],
149
+ },
150
+ valid: false,
151
+ },
152
+ {
153
+ name: 'unsupported nulls_first',
154
+ preAggregate: {
155
+ ...basePreAggregate,
156
+ sorts: [
157
+ {
158
+ fieldId: 'orders_status',
159
+ descending: false,
160
+ nulls_first: true,
161
+ },
162
+ ],
163
+ },
164
+ valid: false,
165
+ },
166
+ ])('$name is valid: $valid', ({ preAggregate, valid }) => {
167
+ validateInBothSchemas(preAggregate, valid);
168
+ });
169
+ });
170
+ //# sourceMappingURL=schema.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"schema.test.js","sourceRoot":"","sources":["../../../src/preAggregates/schema.test.ts"],"names":[],"mappings":"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"}
@@ -876,6 +876,35 @@
876
876
  "type": "string"
877
877
  }
878
878
  },
879
+ "sorts": {
880
+ "description": "Materialization sort order. When omitted, Lightdash automatically sorts the time dimension first and descending, then all remaining materialized dimensions ascending. Set to false or [] to disable sorting, or provide canonical query sort entries with a compiled Lightdash fieldId and explicit descending value. Compiled time-dimension IDs include granularity (for example, orders_order_date_day) and must be updated when granularity changes. Sort order determines which rows are retained when max_rows truncates results.",
881
+ "oneOf": [
882
+ {
883
+ "const": false
884
+ },
885
+ {
886
+ "type": "array",
887
+ "items": {
888
+ "type": "object",
889
+ "properties": {
890
+ "fieldId": {
891
+ "type": "string",
892
+ "minLength": 1
893
+ },
894
+ "descending": {
895
+ "description": "Whether to sort descending. Must be an unquoted YAML boolean.",
896
+ "enum": [true, false]
897
+ }
898
+ },
899
+ "required": [
900
+ "fieldId",
901
+ "descending"
902
+ ],
903
+ "additionalProperties": false
904
+ }
905
+ }
906
+ ]
907
+ },
879
908
  "filters": {
880
909
  "type": "array",
881
910
  "items": {
@@ -95,6 +95,35 @@
95
95
  "type": "string"
96
96
  }
97
97
  },
98
+ "sorts": {
99
+ "description": "Materialization sort order. When omitted, Lightdash automatically sorts the time dimension first and descending, then all remaining materialized dimensions ascending. Set to false or [] to disable sorting, or provide canonical query sort entries with a compiled Lightdash fieldId and explicit descending value. Compiled time-dimension IDs include granularity (for example, orders_order_date_day) and must be updated when granularity changes. Sort order determines which rows are retained when max_rows truncates results.",
100
+ "oneOf": [
101
+ {
102
+ "const": false
103
+ },
104
+ {
105
+ "type": "array",
106
+ "items": {
107
+ "type": "object",
108
+ "properties": {
109
+ "fieldId": {
110
+ "type": "string",
111
+ "minLength": 1
112
+ },
113
+ "descending": {
114
+ "description": "Whether to sort descending. Must be an unquoted YAML boolean.",
115
+ "enum": [true, false]
116
+ }
117
+ },
118
+ "required": [
119
+ "fieldId",
120
+ "descending"
121
+ ],
122
+ "additionalProperties": false
123
+ }
124
+ }
125
+ ]
126
+ },
98
127
  "filters": {
99
128
  "type": "array",
100
129
  "items": {
@@ -6,6 +6,7 @@ import { type JoinRelationship } from './explore';
6
6
  import { type CompactOrAlias, type Dimension, type DimensionType, type FieldUrl, type FilterAutocompleteValue, type Format, type Metric, type MetricType, type NumberSeparator, type Source, type TimestampDomain } from './field';
7
7
  import { type RequiredFilter } from './filterGrammar';
8
8
  import { type LightdashProjectConfig } from './lightdashProjectConfig';
9
+ import { type PreAggregateSort } from './preAggregate';
9
10
  import { type OrderFieldsByStrategy, type TableBase } from './table';
10
11
  import { type DefaultTimeDimension, type TimeFrames } from './timeFrames';
11
12
  export declare enum SupportedDbtAdapter {
@@ -103,7 +104,8 @@ export type DbtPreAggregateDef = {
103
104
  name: string;
104
105
  dimensions: string[];
105
106
  metrics: string[];
106
- filters?: Record<string, AnyType>[];
107
+ sorts?: false | PreAggregateSort[];
108
+ filters?: Record<string, unknown>[];
107
109
  time_dimension?: string;
108
110
  granularity?: string;
109
111
  max_rows?: number;
@@ -111,9 +113,8 @@ export type DbtPreAggregateDef = {
111
113
  cron?: string;
112
114
  };
113
115
  materialization_role?: {
114
- email?: string;
115
- attributes?: Record<string, string | string[]>;
116
- [key: string]: unknown;
116
+ email: string;
117
+ attributes: Record<string, string | string[]>;
117
118
  };
118
119
  };
119
120
  export type SharedDbtModelLightdashConfig = {