@lightdash/common 2.255.0 → 2.255.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/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts +2 -2
- package/dist/cjs/ee/AiAgent/schemas/tools/mcpDocumentContent.js +3 -3
- package/dist/cjs/ee/AiAgent/schemas/tools/mcpDocumentContent.js.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.d.ts +2 -2
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.js +1 -1
- package/dist/cjs/index.d.ts +0 -1
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +0 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/types/content.d.ts +3 -3
- package/dist/cjs/types/content.d.ts.map +1 -1
- package/dist/cjs/types/document.d.ts +11 -61
- package/dist/cjs/types/document.d.ts.map +1 -1
- package/dist/cjs/utils/document.d.ts +3 -3
- package/dist/cjs/utils/document.d.ts.map +1 -1
- package/dist/cjs/utils/document.js +20 -85
- package/dist/cjs/utils/document.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts +2 -2
- package/dist/esm/ee/AiAgent/schemas/tools/mcpDocumentContent.js +3 -3
- package/dist/esm/ee/AiAgent/schemas/tools/mcpDocumentContent.js.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.d.ts +2 -2
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.js +1 -1
- package/dist/esm/index.d.ts +0 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +0 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/types/content.d.ts +3 -3
- package/dist/esm/types/content.d.ts.map +1 -1
- package/dist/esm/types/document.d.ts +11 -61
- package/dist/esm/types/document.d.ts.map +1 -1
- package/dist/esm/utils/document.d.ts +3 -3
- package/dist/esm/utils/document.d.ts.map +1 -1
- package/dist/esm/utils/document.js +20 -85
- package/dist/esm/utils/document.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts +2 -2
- package/dist/types/ee/AiAgent/schemas/tools/mcpDocumentContent.js +3 -3
- package/dist/types/ee/AiAgent/schemas/tools/mcpDocumentContent.js.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.d.ts +2 -2
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.js +1 -1
- package/dist/types/index.d.ts +0 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +0 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/types/content.d.ts +3 -3
- package/dist/types/types/content.d.ts.map +1 -1
- package/dist/types/types/document.d.ts +11 -61
- package/dist/types/types/document.d.ts.map +1 -1
- package/dist/types/utils/document.d.ts +3 -3
- package/dist/types/utils/document.d.ts.map +1 -1
- package/dist/types/utils/document.js +20 -85
- package/dist/types/utils/document.js.map +1 -1
- package/package.json +1 -1
- package/dist/cjs/utils/documentOperations.d.ts +0 -3
- package/dist/cjs/utils/documentOperations.d.ts.map +0 -1
- package/dist/cjs/utils/documentOperations.js +0 -60
- package/dist/cjs/utils/documentOperations.js.map +0 -1
- package/dist/esm/utils/documentOperations.d.ts +0 -3
- package/dist/esm/utils/documentOperations.d.ts.map +0 -1
- package/dist/esm/utils/documentOperations.js +0 -55
- package/dist/esm/utils/documentOperations.js.map +0 -1
- package/dist/types/utils/documentOperations.d.ts +0 -3
- package/dist/types/utils/documentOperations.d.ts.map +0 -1
- package/dist/types/utils/documentOperations.js +0 -55
- package/dist/types/utils/documentOperations.js.map +0 -1
|
@@ -3,7 +3,7 @@ import chartAsCodeSchema from '../schemas/json/chart-as-code-1.0.json';
|
|
|
3
3
|
import { ParameterError } from '../types/errors';
|
|
4
4
|
import { parseSavedMergeQuery, SAVED_MERGE_QUERY_SCHEMA_VERSION, } from '../types/mergeQuery';
|
|
5
5
|
import { ChartType } from '../types/savedCharts';
|
|
6
|
-
export const DOCUMENT_SCHEMA_VERSION =
|
|
6
|
+
export const DOCUMENT_SCHEMA_VERSION = 1;
|
|
7
7
|
export const getDocumentUrl = (projectUuid, documentUuid) => `/projects/${projectUuid}/documents/${documentUuid}`;
|
|
8
8
|
const chartProperties = {
|
|
9
9
|
name: chartAsCodeSchema.properties.name,
|
|
@@ -30,11 +30,9 @@ const chartSchema = (merge) => ({
|
|
|
30
30
|
...(merge ? ['merge'] : []),
|
|
31
31
|
],
|
|
32
32
|
});
|
|
33
|
-
let
|
|
34
|
-
let titledValidator;
|
|
35
|
-
let currentValidator;
|
|
33
|
+
let contentValidator;
|
|
36
34
|
// Lazy compilation keeps importing common safe under browser CSP.
|
|
37
|
-
const createValidator = (
|
|
35
|
+
const createValidator = () => new Ajv({
|
|
38
36
|
strict: false,
|
|
39
37
|
validateFormats: false,
|
|
40
38
|
}).compile({
|
|
@@ -48,13 +46,8 @@ const createValidator = (schemaVersion) => new Ajv({
|
|
|
48
46
|
items: {
|
|
49
47
|
type: 'object',
|
|
50
48
|
additionalProperties: false,
|
|
51
|
-
required: ['
|
|
49
|
+
required: ['type', 'content'],
|
|
52
50
|
properties: {
|
|
53
|
-
id: {
|
|
54
|
-
type: 'string',
|
|
55
|
-
minLength: 1,
|
|
56
|
-
pattern: '\\S',
|
|
57
|
-
},
|
|
58
51
|
type: { enum: ['markdown', 'chart'] },
|
|
59
52
|
content: {},
|
|
60
53
|
},
|
|
@@ -62,24 +55,14 @@ const createValidator = (schemaVersion) => new Ajv({
|
|
|
62
55
|
{
|
|
63
56
|
properties: {
|
|
64
57
|
type: { const: 'markdown' },
|
|
65
|
-
content:
|
|
66
|
-
|
|
67
|
-
:
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
properties: {
|
|
72
|
-
markdown: { type: 'string' },
|
|
73
|
-
...(schemaVersion === 2
|
|
74
|
-
? {
|
|
75
|
-
title: {
|
|
76
|
-
type: 'string',
|
|
77
|
-
pattern: '\\S',
|
|
78
|
-
},
|
|
79
|
-
}
|
|
80
|
-
: {}),
|
|
81
|
-
},
|
|
58
|
+
content: {
|
|
59
|
+
type: 'object',
|
|
60
|
+
additionalProperties: false,
|
|
61
|
+
required: ['markdown'],
|
|
62
|
+
properties: {
|
|
63
|
+
markdown: { type: 'string' },
|
|
82
64
|
},
|
|
65
|
+
},
|
|
83
66
|
},
|
|
84
67
|
},
|
|
85
68
|
{
|
|
@@ -91,14 +74,6 @@ const createValidator = (schemaVersion) => new Ajv({
|
|
|
91
74
|
additionalProperties: false,
|
|
92
75
|
required: ['source', 'chart'],
|
|
93
76
|
properties: {
|
|
94
|
-
...(schemaVersion === 2
|
|
95
|
-
? {
|
|
96
|
-
title: {
|
|
97
|
-
type: 'string',
|
|
98
|
-
pattern: '\\S',
|
|
99
|
-
},
|
|
100
|
-
}
|
|
101
|
-
: {}),
|
|
102
77
|
source: {
|
|
103
78
|
const: merge
|
|
104
79
|
? 'merge'
|
|
@@ -115,55 +90,15 @@ const createValidator = (schemaVersion) => new Ajv({
|
|
|
115
90
|
},
|
|
116
91
|
},
|
|
117
92
|
});
|
|
118
|
-
const validateContent = (validate, raw) => {
|
|
119
|
-
if (!validate(raw)) {
|
|
120
|
-
throw new ParameterError(`Invalid Document content: ${validate.errors?.map((error) => `${error.instancePath} ${error.message}`).join('; ')}`);
|
|
121
|
-
}
|
|
122
|
-
return raw;
|
|
123
|
-
};
|
|
124
|
-
const readContent = (schemaVersion, raw) => {
|
|
125
|
-
if (schemaVersion === 1) {
|
|
126
|
-
legacyValidator ?? (legacyValidator = createValidator(1));
|
|
127
|
-
const legacy = validateContent(legacyValidator, raw);
|
|
128
|
-
return {
|
|
129
|
-
cells: legacy.cells.map((cell) => cell.type === 'markdown'
|
|
130
|
-
? { ...cell, content: { markdown: cell.content } }
|
|
131
|
-
: { ...cell, content: { ...cell.content } }),
|
|
132
|
-
};
|
|
133
|
-
}
|
|
134
|
-
if (schemaVersion === 2) {
|
|
135
|
-
titledValidator ?? (titledValidator = createValidator(2));
|
|
136
|
-
const legacy = validateContent(titledValidator, raw);
|
|
137
|
-
return {
|
|
138
|
-
cells: legacy.cells.map((cell) => cell.type === 'markdown'
|
|
139
|
-
? { ...cell, content: { markdown: cell.content.markdown } }
|
|
140
|
-
: {
|
|
141
|
-
...cell,
|
|
142
|
-
content: cell.content.source === 'semantic'
|
|
143
|
-
? {
|
|
144
|
-
source: 'semantic',
|
|
145
|
-
chart: cell.content.chart,
|
|
146
|
-
}
|
|
147
|
-
: {
|
|
148
|
-
source: 'merge',
|
|
149
|
-
chart: cell.content.chart,
|
|
150
|
-
},
|
|
151
|
-
}),
|
|
152
|
-
};
|
|
153
|
-
}
|
|
154
|
-
if (schemaVersion === DOCUMENT_SCHEMA_VERSION) {
|
|
155
|
-
currentValidator ?? (currentValidator = createValidator(3));
|
|
156
|
-
return validateContent(currentValidator, raw);
|
|
157
|
-
}
|
|
158
|
-
throw new ParameterError(`Unsupported Document schema version: ${schemaVersion}`);
|
|
159
|
-
};
|
|
160
93
|
export const parseDocumentContent = (schemaVersion, raw) => {
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
if (new Set(ids).size !== ids.length) {
|
|
164
|
-
throw new ParameterError('Document cell IDs must be unique');
|
|
94
|
+
if (schemaVersion !== DOCUMENT_SCHEMA_VERSION) {
|
|
95
|
+
throw new ParameterError(`Unsupported Document schema version: ${schemaVersion}`);
|
|
165
96
|
}
|
|
166
|
-
|
|
97
|
+
contentValidator ?? (contentValidator = createValidator());
|
|
98
|
+
if (!contentValidator(raw)) {
|
|
99
|
+
throw new ParameterError(`Invalid Document content: ${contentValidator.errors?.map((error) => `${error.instancePath} ${error.message}`).join('; ')}`);
|
|
100
|
+
}
|
|
101
|
+
raw.cells.forEach((cell, cellIndex) => {
|
|
167
102
|
if (cell.type !== 'chart') {
|
|
168
103
|
return;
|
|
169
104
|
}
|
|
@@ -187,10 +122,10 @@ export const parseDocumentContent = (schemaVersion, raw) => {
|
|
|
187
122
|
if (merge.sources.some((source) => 'queryUuid' in source) ||
|
|
188
123
|
merge.sources.length !== 2 ||
|
|
189
124
|
!parseSavedMergeQuery(SAVED_MERGE_QUERY_SCHEMA_VERSION, merge)) {
|
|
190
|
-
throw new ParameterError(`Invalid merge sources or join keys in cell ${
|
|
125
|
+
throw new ParameterError(`Invalid merge sources or join keys in cell ${cellIndex}`);
|
|
191
126
|
}
|
|
192
127
|
}
|
|
193
128
|
});
|
|
194
|
-
return
|
|
129
|
+
return raw;
|
|
195
130
|
};
|
|
196
131
|
//# sourceMappingURL=document.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../../src/utils/document.ts"],"names":[],"mappings":"AAAA,OAAO,GAA8B,MAAM,KAAK,CAAC;AACjD,OAAO,iBAAiB,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../../src/utils/document.ts"],"names":[],"mappings":"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"}
|