@lightdash/common 1.119.0 → 1.120.1
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.
- package/dist/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/dbt/validation.test.js +8 -0
- package/dist/cjs/dbt/validation.test.js.map +1 -1
- package/dist/cjs/preAggregates/definition.d.ts.map +1 -1
- package/dist/cjs/preAggregates/definition.js +42 -0
- package/dist/cjs/preAggregates/definition.js.map +1 -1
- package/dist/cjs/preAggregates/definition.test.js +115 -0
- package/dist/cjs/preAggregates/definition.test.js.map +1 -1
- package/dist/cjs/preAggregates/schema.test.d.ts +2 -0
- package/dist/cjs/preAggregates/schema.test.d.ts.map +1 -0
- package/dist/cjs/preAggregates/schema.test.js +173 -0
- package/dist/cjs/preAggregates/schema.test.js.map +1 -0
- package/dist/cjs/schemas/json/lightdash-dbt-2.0.json +29 -0
- package/dist/cjs/schemas/json/model-as-code-1.0.json +29 -0
- package/dist/cjs/types/dbt.d.ts +5 -4
- package/dist/cjs/types/dbt.d.ts.map +1 -1
- package/dist/cjs/types/dbt.js.map +1 -1
- package/dist/cjs/types/preAggregate.d.ts +3 -1
- package/dist/cjs/types/preAggregate.d.ts.map +1 -1
- package/dist/cjs/types/preAggregate.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/dbt/validation.test.js +7 -0
- package/dist/esm/dbt/validation.test.js.map +1 -1
- package/dist/esm/preAggregates/definition.d.ts.map +1 -1
- package/dist/esm/preAggregates/definition.js +42 -0
- package/dist/esm/preAggregates/definition.js.map +1 -1
- package/dist/esm/preAggregates/definition.test.js +115 -0
- package/dist/esm/preAggregates/definition.test.js.map +1 -1
- package/dist/esm/preAggregates/schema.test.d.ts +2 -0
- package/dist/esm/preAggregates/schema.test.d.ts.map +1 -0
- package/dist/esm/preAggregates/schema.test.js +170 -0
- package/dist/esm/preAggregates/schema.test.js.map +1 -0
- package/dist/esm/schemas/json/lightdash-dbt-2.0.json +29 -0
- package/dist/esm/schemas/json/model-as-code-1.0.json +29 -0
- package/dist/esm/types/dbt.d.ts +5 -4
- package/dist/esm/types/dbt.d.ts.map +1 -1
- package/dist/esm/types/dbt.js.map +1 -1
- package/dist/esm/types/preAggregate.d.ts +3 -1
- package/dist/esm/types/preAggregate.d.ts.map +1 -1
- package/dist/esm/types/preAggregate.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/dbt/validation.test.js +7 -0
- package/dist/types/dbt/validation.test.js.map +1 -1
- package/dist/types/preAggregates/definition.d.ts.map +1 -1
- package/dist/types/preAggregates/definition.js +42 -0
- package/dist/types/preAggregates/definition.js.map +1 -1
- package/dist/types/preAggregates/definition.test.js +115 -0
- package/dist/types/preAggregates/definition.test.js.map +1 -1
- package/dist/types/preAggregates/schema.test.d.ts +2 -0
- package/dist/types/preAggregates/schema.test.d.ts.map +1 -0
- package/dist/types/preAggregates/schema.test.js +170 -0
- package/dist/types/preAggregates/schema.test.js.map +1 -0
- package/dist/types/schemas/json/lightdash-dbt-2.0.json +29 -0
- package/dist/types/schemas/json/model-as-code-1.0.json +29 -0
- package/dist/types/types/dbt.d.ts +5 -4
- package/dist/types/types/dbt.d.ts.map +1 -1
- package/dist/types/types/dbt.js.map +1 -1
- package/dist/types/types/preAggregate.d.ts +3 -1
- package/dist/types/types/preAggregate.d.ts.map +1 -1
- package/dist/types/types/preAggregate.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
3
4
|
const translator_mock_1 = require("../compiler/translator.mock");
|
|
4
5
|
const dbt_1 = require("../types/dbt");
|
|
6
|
+
const lightdashMetadata_json_1 = tslib_1.__importDefault(require("./schemas/lightdashMetadata.json"));
|
|
5
7
|
const validation_1 = require("./validation");
|
|
6
8
|
const metadataSchemaId = 'https://schemas.lightdash.com/lightdash/metadata.json';
|
|
7
9
|
const defaultTimeDimensionValidator = validation_1.ManifestValidator.getValidator(`${metadataSchemaId}#/definitions/DefaultTimeDimension`);
|
|
@@ -61,6 +63,12 @@ describe('DefaultTimeDimension metadata schema', () => {
|
|
|
61
63
|
})).toEqual([true, undefined]);
|
|
62
64
|
});
|
|
63
65
|
});
|
|
66
|
+
describe('pre-aggregate manifest validation boundary', () => {
|
|
67
|
+
test('keeps runtime parsing responsible while metadata schema omits pre-aggregates', () => {
|
|
68
|
+
expect(lightdashMetadata_json_1.default.definitions.LightdashModelMetadata
|
|
69
|
+
.properties).not.toHaveProperty('pre_aggregates');
|
|
70
|
+
});
|
|
71
|
+
});
|
|
64
72
|
describe('AI hint manifest compatibility', () => {
|
|
65
73
|
test('does not invalidate an explore with malformed optional hints', () => {
|
|
66
74
|
const malformedHint = { Formula: 'clicks + keys' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.test.js","sourceRoot":"","sources":["../../../src/dbt/validation.test.ts"],"names":[],"mappings":"
|
|
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,
|
|
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"}
|
|
@@ -11,6 +11,7 @@ const errors_1 = require("../types/errors");
|
|
|
11
11
|
const filterGrammar_1 = require("../types/filterGrammar");
|
|
12
12
|
const timeFrames_1 = require("../types/timeFrames");
|
|
13
13
|
const PRE_AGGREGATE_NAME_PATTERN = /^[a-zA-Z0-9_]+$/;
|
|
14
|
+
const isUnknownRecord = (value) => (0, isPlainObject_1.default)(value);
|
|
14
15
|
const parsePreAggregateGranularity = (granularity, modelName, preAggregateName) => {
|
|
15
16
|
const normalized = granularity.trim().toUpperCase();
|
|
16
17
|
if (!Object.values(timeFrames_1.TimeFrames).includes(normalized)) {
|
|
@@ -29,6 +30,43 @@ const parsePreAggregateStringArray = (value, fieldName, modelName, preAggregateN
|
|
|
29
30
|
return item.trim();
|
|
30
31
|
});
|
|
31
32
|
};
|
|
33
|
+
const parsePreAggregateSorts = (value, modelName, preAggregateName) => {
|
|
34
|
+
if (value === false) {
|
|
35
|
+
return [];
|
|
36
|
+
}
|
|
37
|
+
if (!Array.isArray(value)) {
|
|
38
|
+
throw new errors_1.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.`);
|
|
39
|
+
}
|
|
40
|
+
const fieldIds = new Set();
|
|
41
|
+
return value.map((sort, index) => {
|
|
42
|
+
if (!isUnknownRecord(sort)) {
|
|
43
|
+
throw new errors_1.ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}. Expected an object.`);
|
|
44
|
+
}
|
|
45
|
+
const { fieldId, descending, ...unknownFields } = sort;
|
|
46
|
+
const unsupportedFields = Object.keys(unknownFields);
|
|
47
|
+
if (unsupportedFields.length > 0) {
|
|
48
|
+
throw new errors_1.ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has unsupported "sorts" fields: ${unsupportedFields.join(', ')}`);
|
|
49
|
+
}
|
|
50
|
+
if (typeof fieldId !== 'string' || fieldId.trim().length === 0) {
|
|
51
|
+
throw new errors_1.ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}: "fieldId" must be a non-empty string.`);
|
|
52
|
+
}
|
|
53
|
+
const normalizedFieldId = fieldId.trim();
|
|
54
|
+
if (fieldIds.has(normalizedFieldId)) {
|
|
55
|
+
throw new errors_1.ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has duplicate "sorts" fieldId "${normalizedFieldId}".`);
|
|
56
|
+
}
|
|
57
|
+
fieldIds.add(normalizedFieldId);
|
|
58
|
+
if (descending === undefined) {
|
|
59
|
+
throw new errors_1.ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}: "descending" is required.`);
|
|
60
|
+
}
|
|
61
|
+
if (typeof descending !== 'boolean') {
|
|
62
|
+
throw new errors_1.ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "sorts" entry at index ${index}: "descending" must be a boolean.`);
|
|
63
|
+
}
|
|
64
|
+
return {
|
|
65
|
+
fieldId: normalizedFieldId,
|
|
66
|
+
descending,
|
|
67
|
+
};
|
|
68
|
+
});
|
|
69
|
+
};
|
|
32
70
|
const parseMaterializationRoleAttributes = (value, modelName, preAggregateName) => {
|
|
33
71
|
if (!(0, isPlainObject_1.default)(value) || (0, isEmpty_1.default)(value)) {
|
|
34
72
|
throw new errors_1.ParseError(`Pre-aggregate "${preAggregateName}" in model "${modelName}" has invalid "materialization_role.attributes". Expected a non-empty object.`);
|
|
@@ -98,6 +136,9 @@ const parseDbtPreAggregateDef = (preAggregate, modelName) => {
|
|
|
98
136
|
const materializationRole = safePreAggregate?.materialization_role !== undefined
|
|
99
137
|
? parseMaterializationRole(safePreAggregate.materialization_role, modelName, name)
|
|
100
138
|
: undefined;
|
|
139
|
+
const sorts = safePreAggregate?.sorts !== undefined
|
|
140
|
+
? parsePreAggregateSorts(safePreAggregate.sorts, modelName, name)
|
|
141
|
+
: undefined;
|
|
101
142
|
const filters = safePreAggregate?.filters
|
|
102
143
|
? (0, filterGrammar_1.parseFilters)(safePreAggregate.filters)
|
|
103
144
|
: undefined;
|
|
@@ -105,6 +146,7 @@ const parseDbtPreAggregateDef = (preAggregate, modelName) => {
|
|
|
105
146
|
name,
|
|
106
147
|
dimensions,
|
|
107
148
|
metrics,
|
|
149
|
+
...(sorts !== undefined ? { sorts } : {}),
|
|
108
150
|
...(filters ? { filters } : {}),
|
|
109
151
|
...(timeDimension ? { timeDimension } : {}),
|
|
110
152
|
...(granularity ? { granularity } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../../src/preAggregates/definition.ts"],"names":[],"mappings":";;;;AAAA,yEAAyC;AACzC,qEAAqC;AACrC,iFAAiD;AACjD,uEAAuC;AACvC,+DAA+B;AAE/B,4CAA6C;AAC7C,0DAAsD;
|
|
1
|
+
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../../src/preAggregates/definition.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,121 @@ describe('parseDbtPreAggregateDef', () => {
|
|
|
10
10
|
dimensions: ['order_date'],
|
|
11
11
|
metrics: ['order_count'],
|
|
12
12
|
};
|
|
13
|
+
it('parses canonical materialization sorts in order', () => {
|
|
14
|
+
expect((0, definition_1.parseDbtPreAggregateDef)({
|
|
15
|
+
...basePreAggregate,
|
|
16
|
+
sorts: [
|
|
17
|
+
{
|
|
18
|
+
fieldId: ' orders_order_date_day ',
|
|
19
|
+
descending: true,
|
|
20
|
+
},
|
|
21
|
+
{ fieldId: 'orders_status', descending: false },
|
|
22
|
+
],
|
|
23
|
+
}, 'orders')).toEqual({
|
|
24
|
+
...basePreAggregate,
|
|
25
|
+
sorts: [
|
|
26
|
+
{
|
|
27
|
+
fieldId: 'orders_order_date_day',
|
|
28
|
+
descending: true,
|
|
29
|
+
},
|
|
30
|
+
{ fieldId: 'orders_status', descending: false },
|
|
31
|
+
],
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
it('omits materialization sorts when they are not configured', () => {
|
|
35
|
+
expect((0, definition_1.parseDbtPreAggregateDef)(basePreAggregate, 'orders')).not.toHaveProperty('sorts');
|
|
36
|
+
});
|
|
37
|
+
it.each([
|
|
38
|
+
{ name: 'false', sorts: false },
|
|
39
|
+
{ name: 'an empty array', sorts: [] },
|
|
40
|
+
])('normalizes $name to disabled materialization sorts', ({ sorts }) => {
|
|
41
|
+
expect((0, definition_1.parseDbtPreAggregateDef)({
|
|
42
|
+
...basePreAggregate,
|
|
43
|
+
sorts,
|
|
44
|
+
}, 'orders')).toHaveProperty('sorts', []);
|
|
45
|
+
});
|
|
46
|
+
it.each([
|
|
47
|
+
{
|
|
48
|
+
name: 'true',
|
|
49
|
+
sorts: true,
|
|
50
|
+
message: 'Expected an array of sort entries, or false / []',
|
|
51
|
+
},
|
|
52
|
+
{
|
|
53
|
+
name: 'null',
|
|
54
|
+
sorts: null,
|
|
55
|
+
message: 'Expected an array of sort entries, or false / []',
|
|
56
|
+
},
|
|
57
|
+
{
|
|
58
|
+
name: 'a non-object entry',
|
|
59
|
+
sorts: [null],
|
|
60
|
+
message: 'Expected an object',
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
name: 'the old field key',
|
|
64
|
+
sorts: [{ field: 'order_date', descending: true }],
|
|
65
|
+
message: 'has unsupported "sorts" fields: field',
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
name: 'a missing fieldId',
|
|
69
|
+
sorts: [{ descending: false }],
|
|
70
|
+
message: '"fieldId" must be a non-empty string',
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
name: 'an empty fieldId',
|
|
74
|
+
sorts: [{ fieldId: '', descending: false }],
|
|
75
|
+
message: '"fieldId" must be a non-empty string',
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
name: 'a missing direction',
|
|
79
|
+
sorts: [{ fieldId: 'orders_order_date_day' }],
|
|
80
|
+
message: '"descending" is required',
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
name: 'an invalid direction',
|
|
84
|
+
sorts: [
|
|
85
|
+
{
|
|
86
|
+
fieldId: 'orders_order_date_day',
|
|
87
|
+
descending: 'yes',
|
|
88
|
+
},
|
|
89
|
+
],
|
|
90
|
+
message: '"descending" must be a boolean',
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
name: 'a misspelled direction',
|
|
94
|
+
sorts: [
|
|
95
|
+
{
|
|
96
|
+
fieldId: 'orders_order_date_day',
|
|
97
|
+
descending: true,
|
|
98
|
+
desceding: false,
|
|
99
|
+
},
|
|
100
|
+
],
|
|
101
|
+
message: 'has unsupported "sorts" fields: desceding',
|
|
102
|
+
},
|
|
103
|
+
{
|
|
104
|
+
name: 'unsupported null ordering',
|
|
105
|
+
sorts: [
|
|
106
|
+
{
|
|
107
|
+
fieldId: 'orders_order_date_day',
|
|
108
|
+
descending: true,
|
|
109
|
+
nulls_first: true,
|
|
110
|
+
},
|
|
111
|
+
],
|
|
112
|
+
message: 'has unsupported "sorts" fields: nulls_first',
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
name: 'a duplicate fieldId',
|
|
116
|
+
sorts: [
|
|
117
|
+
{ fieldId: 'orders_status', descending: false },
|
|
118
|
+
{ fieldId: ' orders_status ', descending: true },
|
|
119
|
+
],
|
|
120
|
+
message: 'has duplicate "sorts" fieldId "orders_status"',
|
|
121
|
+
},
|
|
122
|
+
])('rejects $name in materialization sorts', ({ sorts, message }) => {
|
|
123
|
+
expect(() => (0, definition_1.parseDbtPreAggregateDef)({
|
|
124
|
+
...basePreAggregate,
|
|
125
|
+
sorts,
|
|
126
|
+
}, 'orders')).toThrow(message);
|
|
127
|
+
});
|
|
13
128
|
it('parses materialization_role and normalizes scalar attributes to arrays', () => {
|
|
14
129
|
const result = (0, definition_1.parseDbtPreAggregateDef)({
|
|
15
130
|
...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 @@
|
|
|
1
|
+
{"version":3,"file":"schema.test.d.ts","sourceRoot":"","sources":["../../../src/preAggregates/schema.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const ajv_1 = tslib_1.__importDefault(require("ajv"));
|
|
5
|
+
const ajv_errors_1 = tslib_1.__importDefault(require("ajv-errors"));
|
|
6
|
+
const ajv_formats_1 = tslib_1.__importDefault(require("ajv-formats"));
|
|
7
|
+
const lightdash_dbt_2_0_json_1 = tslib_1.__importDefault(require("../schemas/json/lightdash-dbt-2.0.json"));
|
|
8
|
+
const model_as_code_1_0_json_1 = tslib_1.__importDefault(require("../schemas/json/model-as-code-1.0.json"));
|
|
9
|
+
const dbtYamlAjv = new ajv_1.default({
|
|
10
|
+
allErrors: true,
|
|
11
|
+
allowUnionTypes: true,
|
|
12
|
+
coerceTypes: true,
|
|
13
|
+
});
|
|
14
|
+
(0, ajv_errors_1.default)(dbtYamlAjv);
|
|
15
|
+
const modelYamlAjv = new ajv_1.default({
|
|
16
|
+
allErrors: true,
|
|
17
|
+
allowUnionTypes: true,
|
|
18
|
+
coerceTypes: true,
|
|
19
|
+
discriminator: true,
|
|
20
|
+
});
|
|
21
|
+
(0, ajv_formats_1.default)(modelYamlAjv);
|
|
22
|
+
const validateDbtYaml = dbtYamlAjv.compile(lightdash_dbt_2_0_json_1.default);
|
|
23
|
+
const validateModelYaml = modelYamlAjv.compile(model_as_code_1_0_json_1.default);
|
|
24
|
+
const basePreAggregate = {
|
|
25
|
+
name: 'orders_rollup',
|
|
26
|
+
dimensions: ['status'],
|
|
27
|
+
metrics: ['order_count'],
|
|
28
|
+
};
|
|
29
|
+
const validateInBothSchemas = (preAggregate, expected) => {
|
|
30
|
+
const dbtDocument = {
|
|
31
|
+
version: 2,
|
|
32
|
+
models: [
|
|
33
|
+
{
|
|
34
|
+
name: 'orders',
|
|
35
|
+
meta: { pre_aggregates: [preAggregate] },
|
|
36
|
+
},
|
|
37
|
+
],
|
|
38
|
+
};
|
|
39
|
+
const modelDocument = {
|
|
40
|
+
type: 'model',
|
|
41
|
+
name: 'orders',
|
|
42
|
+
sql_from: 'analytics.orders',
|
|
43
|
+
dimensions: [
|
|
44
|
+
{
|
|
45
|
+
name: 'status',
|
|
46
|
+
type: 'string',
|
|
47
|
+
sql: '${TABLE}.status',
|
|
48
|
+
},
|
|
49
|
+
],
|
|
50
|
+
pre_aggregates: [preAggregate],
|
|
51
|
+
};
|
|
52
|
+
expect(validateDbtYaml(dbtDocument)).toBe(expected);
|
|
53
|
+
expect(validateModelYaml(modelDocument)).toBe(expected);
|
|
54
|
+
};
|
|
55
|
+
describe('pre-aggregate sort schema parity', () => {
|
|
56
|
+
it('keeps the dbt and model-as-code sort contracts identical', () => {
|
|
57
|
+
const dbtSortSchema = lightdash_dbt_2_0_json_1.default.$defs.modelMeta.properties.pre_aggregates
|
|
58
|
+
.items.properties.sorts;
|
|
59
|
+
const modelSortSchema = model_as_code_1_0_json_1.default.definitions.BaseModel.properties.pre_aggregates
|
|
60
|
+
.items.properties.sorts;
|
|
61
|
+
expect(dbtSortSchema).toStrictEqual(modelSortSchema);
|
|
62
|
+
});
|
|
63
|
+
it.each([
|
|
64
|
+
{
|
|
65
|
+
name: 'canonical sorts',
|
|
66
|
+
preAggregate: {
|
|
67
|
+
...basePreAggregate,
|
|
68
|
+
sorts: [
|
|
69
|
+
{ fieldId: 'orders_status', descending: false },
|
|
70
|
+
{
|
|
71
|
+
fieldId: 'orders_order_date_day',
|
|
72
|
+
descending: true,
|
|
73
|
+
},
|
|
74
|
+
],
|
|
75
|
+
},
|
|
76
|
+
valid: true,
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
name: 'disabled sorts with false',
|
|
80
|
+
preAggregate: { ...basePreAggregate, sorts: false },
|
|
81
|
+
valid: true,
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
name: 'disabled sorts with an empty array',
|
|
85
|
+
preAggregate: { ...basePreAggregate, sorts: [] },
|
|
86
|
+
valid: true,
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
name: 'omitted sorts',
|
|
90
|
+
preAggregate: basePreAggregate,
|
|
91
|
+
valid: true,
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
name: 'a non-object entry',
|
|
95
|
+
preAggregate: {
|
|
96
|
+
...basePreAggregate,
|
|
97
|
+
sorts: [null],
|
|
98
|
+
},
|
|
99
|
+
valid: false,
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
name: 'a missing fieldId',
|
|
103
|
+
preAggregate: {
|
|
104
|
+
...basePreAggregate,
|
|
105
|
+
sorts: [{ descending: false }],
|
|
106
|
+
},
|
|
107
|
+
valid: false,
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
name: 'a missing descending value',
|
|
111
|
+
preAggregate: {
|
|
112
|
+
...basePreAggregate,
|
|
113
|
+
sorts: [{ fieldId: 'orders_status' }],
|
|
114
|
+
},
|
|
115
|
+
valid: false,
|
|
116
|
+
},
|
|
117
|
+
{
|
|
118
|
+
name: 'a non-boolean descending value',
|
|
119
|
+
preAggregate: {
|
|
120
|
+
...basePreAggregate,
|
|
121
|
+
sorts: [{ fieldId: 'orders_status', descending: 'yes' }],
|
|
122
|
+
},
|
|
123
|
+
valid: false,
|
|
124
|
+
},
|
|
125
|
+
{
|
|
126
|
+
name: 'a quoted boolean descending value',
|
|
127
|
+
preAggregate: {
|
|
128
|
+
...basePreAggregate,
|
|
129
|
+
sorts: [{ fieldId: 'orders_status', descending: 'true' }],
|
|
130
|
+
},
|
|
131
|
+
valid: false,
|
|
132
|
+
},
|
|
133
|
+
{
|
|
134
|
+
name: 'the old field key',
|
|
135
|
+
preAggregate: {
|
|
136
|
+
...basePreAggregate,
|
|
137
|
+
sorts: [{ field: 'status', descending: false }],
|
|
138
|
+
},
|
|
139
|
+
valid: false,
|
|
140
|
+
},
|
|
141
|
+
{
|
|
142
|
+
name: 'a misspelled desceding key',
|
|
143
|
+
preAggregate: {
|
|
144
|
+
...basePreAggregate,
|
|
145
|
+
sorts: [
|
|
146
|
+
{
|
|
147
|
+
fieldId: 'orders_status',
|
|
148
|
+
descending: false,
|
|
149
|
+
desceding: true,
|
|
150
|
+
},
|
|
151
|
+
],
|
|
152
|
+
},
|
|
153
|
+
valid: false,
|
|
154
|
+
},
|
|
155
|
+
{
|
|
156
|
+
name: 'unsupported nulls_first',
|
|
157
|
+
preAggregate: {
|
|
158
|
+
...basePreAggregate,
|
|
159
|
+
sorts: [
|
|
160
|
+
{
|
|
161
|
+
fieldId: 'orders_status',
|
|
162
|
+
descending: false,
|
|
163
|
+
nulls_first: true,
|
|
164
|
+
},
|
|
165
|
+
],
|
|
166
|
+
},
|
|
167
|
+
valid: false,
|
|
168
|
+
},
|
|
169
|
+
])('$name is valid: $valid', ({ preAggregate, valid }) => {
|
|
170
|
+
validateInBothSchemas(preAggregate, valid);
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
//# 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": {
|
package/dist/cjs/types/dbt.d.ts
CHANGED
|
@@ -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
|
-
|
|
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
|
|
115
|
-
attributes
|
|
116
|
-
[key: string]: unknown;
|
|
116
|
+
email: string;
|
|
117
|
+
attributes: Record<string, string | string[]>;
|
|
117
118
|
};
|
|
118
119
|
};
|
|
119
120
|
export type SharedDbtModelLightdashConfig = {
|