@lightdash/common 2.415.8 → 2.417.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.
- package/dist/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts +244 -288
- package/dist/cjs/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/mcpDocumentContent.js +19 -24
- package/dist/cjs/ee/AiAgent/schemas/tools/mcpDocumentContent.js.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.d.ts +238 -274
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.d.ts.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.js +3 -3
- package/dist/cjs/ee/AiAgent/schemas/tools/toolDefinitions.js.map +1 -1
- package/dist/cjs/ee/AiAgent/schemas/tools/toolReadContentArgs.js +1 -1
- package/dist/cjs/ee/externalConnections/types.d.ts +2 -2
- package/dist/cjs/ee/externalConnections/types.d.ts.map +1 -1
- package/dist/cjs/index.d.ts +1 -0
- package/dist/cjs/index.d.ts.map +1 -1
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/types/document.d.ts +16 -18
- package/dist/cjs/types/document.d.ts.map +1 -1
- package/dist/cjs/utils/document.d.ts +5 -1
- package/dist/cjs/utils/document.d.ts.map +1 -1
- package/dist/cjs/utils/document.js +56 -77
- package/dist/cjs/utils/document.js.map +1 -1
- package/dist/cjs/utils/documentMarkdown.d.ts +65 -0
- package/dist/cjs/utils/documentMarkdown.d.ts.map +1 -0
- package/dist/cjs/utils/documentMarkdown.js +221 -0
- package/dist/cjs/utils/documentMarkdown.js.map +1 -0
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts +244 -288
- package/dist/esm/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/mcpDocumentContent.js +18 -23
- package/dist/esm/ee/AiAgent/schemas/tools/mcpDocumentContent.js.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.d.ts +238 -274
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.d.ts.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.js +3 -3
- package/dist/esm/ee/AiAgent/schemas/tools/toolDefinitions.js.map +1 -1
- package/dist/esm/ee/AiAgent/schemas/tools/toolReadContentArgs.js +1 -1
- package/dist/esm/ee/externalConnections/types.d.ts +2 -2
- package/dist/esm/ee/externalConnections/types.d.ts.map +1 -1
- package/dist/esm/index.d.ts +1 -0
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/types/document.d.ts +16 -18
- package/dist/esm/types/document.d.ts.map +1 -1
- package/dist/esm/utils/document.d.ts +5 -1
- package/dist/esm/utils/document.d.ts.map +1 -1
- package/dist/esm/utils/document.js +56 -77
- package/dist/esm/utils/document.js.map +1 -1
- package/dist/esm/utils/documentMarkdown.d.ts +65 -0
- package/dist/esm/utils/documentMarkdown.d.ts.map +1 -0
- package/dist/esm/utils/documentMarkdown.js +206 -0
- package/dist/esm/utils/documentMarkdown.js.map +1 -0
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts +244 -288
- package/dist/types/ee/AiAgent/schemas/tools/mcpDocumentContent.d.ts.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/mcpDocumentContent.js +18 -23
- package/dist/types/ee/AiAgent/schemas/tools/mcpDocumentContent.js.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.d.ts +238 -274
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.d.ts.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.js +3 -3
- package/dist/types/ee/AiAgent/schemas/tools/toolDefinitions.js.map +1 -1
- package/dist/types/ee/AiAgent/schemas/tools/toolReadContentArgs.js +1 -1
- package/dist/types/ee/externalConnections/types.d.ts +2 -2
- package/dist/types/ee/externalConnections/types.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/types/document.d.ts +16 -18
- package/dist/types/types/document.d.ts.map +1 -1
- package/dist/types/utils/document.d.ts +5 -1
- package/dist/types/utils/document.d.ts.map +1 -1
- package/dist/types/utils/document.js +56 -77
- package/dist/types/utils/document.js.map +1 -1
- package/dist/types/utils/documentMarkdown.d.ts +65 -0
- package/dist/types/utils/documentMarkdown.d.ts.map +1 -0
- package/dist/types/utils/documentMarkdown.js +206 -0
- package/dist/types/utils/documentMarkdown.js.map +1 -0
- package/package.json +1 -1
|
@@ -8,7 +8,8 @@ const chart_as_code_1_0_json_1 = tslib_1.__importDefault(require("../schemas/jso
|
|
|
8
8
|
const errors_1 = require("../types/errors");
|
|
9
9
|
const mergeQuery_1 = require("../types/mergeQuery");
|
|
10
10
|
const savedCharts_1 = require("../types/savedCharts");
|
|
11
|
-
|
|
11
|
+
const documentMarkdown_1 = require("./documentMarkdown");
|
|
12
|
+
exports.DOCUMENT_SCHEMA_VERSION = 2;
|
|
12
13
|
const getDocumentUrl = (projectUuidOrSlug, documentUuidOrSlug, documentSlug) => `/projects/${encodeURIComponent(projectUuidOrSlug)}/documents/${encodeURIComponent(documentSlug && !(0, uuid_1.validate)(documentSlug)
|
|
13
14
|
? documentSlug
|
|
14
15
|
: documentUuidOrSlug)}`;
|
|
@@ -47,57 +48,55 @@ const createValidator = () => new ajv_1.default({
|
|
|
47
48
|
$defs: chart_as_code_1_0_json_1.default.$defs,
|
|
48
49
|
type: 'object',
|
|
49
50
|
additionalProperties: false,
|
|
50
|
-
required: ['
|
|
51
|
+
required: ['markdown', 'charts'],
|
|
51
52
|
properties: {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
{
|
|
64
|
-
properties: {
|
|
65
|
-
type: { const: 'markdown' },
|
|
66
|
-
content: {
|
|
67
|
-
type: 'object',
|
|
68
|
-
additionalProperties: false,
|
|
69
|
-
required: ['markdown'],
|
|
70
|
-
properties: {
|
|
71
|
-
markdown: { type: 'string' },
|
|
72
|
-
},
|
|
73
|
-
},
|
|
74
|
-
},
|
|
53
|
+
markdown: { type: 'string' },
|
|
54
|
+
charts: {
|
|
55
|
+
type: 'object',
|
|
56
|
+
additionalProperties: {
|
|
57
|
+
oneOf: [false, true].map((merge) => ({
|
|
58
|
+
type: 'object',
|
|
59
|
+
additionalProperties: false,
|
|
60
|
+
required: ['source', 'chart'],
|
|
61
|
+
properties: {
|
|
62
|
+
source: { const: merge ? 'merge' : 'semantic' },
|
|
63
|
+
chart: chartSchema(merge),
|
|
75
64
|
},
|
|
76
|
-
|
|
77
|
-
properties: {
|
|
78
|
-
type: { const: 'chart' },
|
|
79
|
-
content: {
|
|
80
|
-
oneOf: [false, true].map((merge) => ({
|
|
81
|
-
type: 'object',
|
|
82
|
-
additionalProperties: false,
|
|
83
|
-
required: ['source', 'chart'],
|
|
84
|
-
properties: {
|
|
85
|
-
source: {
|
|
86
|
-
const: merge
|
|
87
|
-
? 'merge'
|
|
88
|
-
: 'semantic',
|
|
89
|
-
},
|
|
90
|
-
chart: chartSchema(merge),
|
|
91
|
-
},
|
|
92
|
-
})),
|
|
93
|
-
},
|
|
94
|
-
},
|
|
95
|
-
},
|
|
96
|
-
],
|
|
65
|
+
})),
|
|
97
66
|
},
|
|
98
67
|
},
|
|
99
68
|
},
|
|
100
69
|
});
|
|
70
|
+
const validateChart = (id, content) => {
|
|
71
|
+
const { chart } = content;
|
|
72
|
+
const queries = [
|
|
73
|
+
chart.metricQuery,
|
|
74
|
+
...(content.source === 'merge'
|
|
75
|
+
? content.chart.merge.sources
|
|
76
|
+
.filter((source) => source.kind === 'query')
|
|
77
|
+
.map((source) => source.metricQuery)
|
|
78
|
+
: []),
|
|
79
|
+
];
|
|
80
|
+
if (queries.some((query) => ['queryUuid', 'results', 'rows'].some((key) => key in query))) {
|
|
81
|
+
throw new errors_1.ParameterError('Document charts must contain durable queries, not query UUIDs or results');
|
|
82
|
+
}
|
|
83
|
+
if (chart.chartConfig.type === savedCharts_1.ChartType.DATA_APP_VIZ &&
|
|
84
|
+
chart.chartConfig.config === undefined) {
|
|
85
|
+
throw new errors_1.ParameterError(`Custom chart "${id}" must reference a chart type`);
|
|
86
|
+
}
|
|
87
|
+
if (content.source === 'merge') {
|
|
88
|
+
const { merge } = content.chart;
|
|
89
|
+
if (merge.sources.some((source) => 'queryUuid' in source) ||
|
|
90
|
+
merge.sources.length !== 2 ||
|
|
91
|
+
!(0, mergeQuery_1.parseSavedMergeQuery)(merge)) {
|
|
92
|
+
throw new errors_1.ParameterError(`Invalid merge sources or join keys in chart "${id}"`);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
/**
|
|
97
|
+
* Validate Document content and return its canonical form: chart tags carry
|
|
98
|
+
* only their id and charts that are not placed in the markdown are dropped.
|
|
99
|
+
*/
|
|
101
100
|
const parseDocumentContent = (schemaVersion, raw) => {
|
|
102
101
|
if (schemaVersion !== exports.DOCUMENT_SCHEMA_VERSION) {
|
|
103
102
|
throw new errors_1.ParameterError(`Unsupported Document schema version: ${schemaVersion}`);
|
|
@@ -106,36 +105,12 @@ const parseDocumentContent = (schemaVersion, raw) => {
|
|
|
106
105
|
if (!contentValidator(raw)) {
|
|
107
106
|
throw new errors_1.ParameterError(`Invalid Document content: ${contentValidator.errors?.map((error) => `${error.instancePath} ${error.message}`).join('; ')}`);
|
|
108
107
|
}
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
const { chart } = cell.content;
|
|
114
|
-
const queries = [
|
|
115
|
-
chart.metricQuery,
|
|
116
|
-
...(cell.content.source === 'merge'
|
|
117
|
-
? cell.content.chart.merge.sources
|
|
118
|
-
.filter((source) => source.kind === 'query')
|
|
119
|
-
.map((source) => source.metricQuery)
|
|
120
|
-
: []),
|
|
121
|
-
];
|
|
122
|
-
if (queries.some((query) => ['queryUuid', 'results', 'rows'].some((key) => key in query))) {
|
|
123
|
-
throw new errors_1.ParameterError('Document charts must contain durable queries, not query UUIDs or results');
|
|
124
|
-
}
|
|
125
|
-
if (chart.chartConfig.type === savedCharts_1.ChartType.DATA_APP_VIZ &&
|
|
126
|
-
chart.chartConfig.config === undefined) {
|
|
127
|
-
throw new errors_1.ParameterError(`Custom chart in cell ${cellIndex} must reference a chart type`);
|
|
128
|
-
}
|
|
129
|
-
if (cell.content.source === 'merge') {
|
|
130
|
-
const { merge } = cell.content.chart;
|
|
131
|
-
if (merge.sources.some((source) => 'queryUuid' in source) ||
|
|
132
|
-
merge.sources.length !== 2 ||
|
|
133
|
-
!(0, mergeQuery_1.parseSavedMergeQuery)(merge)) {
|
|
134
|
-
throw new errors_1.ParameterError(`Invalid merge sources or join keys in cell ${cellIndex}`);
|
|
135
|
-
}
|
|
136
|
-
}
|
|
108
|
+
const blocks = (0, documentMarkdown_1.getDocumentChartBlocks)(raw);
|
|
109
|
+
blocks.forEach((block) => {
|
|
110
|
+
if (block.type === 'chart')
|
|
111
|
+
validateChart(block.id, block.chart);
|
|
137
112
|
});
|
|
138
|
-
return
|
|
113
|
+
return (0, documentMarkdown_1.fromDocumentChartBlocks)(blocks);
|
|
139
114
|
};
|
|
140
115
|
exports.parseDocumentContent = parseDocumentContent;
|
|
141
116
|
const DOCUMENT_AS_CODE_KEYS = [
|
|
@@ -144,7 +119,8 @@ const DOCUMENT_AS_CODE_KEYS = [
|
|
|
144
119
|
'description',
|
|
145
120
|
'spaceSlug',
|
|
146
121
|
'schemaVersion',
|
|
147
|
-
'
|
|
122
|
+
'markdown',
|
|
123
|
+
'charts',
|
|
148
124
|
];
|
|
149
125
|
const isRecord = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
150
126
|
const isNonBlankString = (value) => typeof value === 'string' && value.trim() !== '';
|
|
@@ -175,7 +151,10 @@ const parseDocumentAsCode = (raw) => {
|
|
|
175
151
|
description,
|
|
176
152
|
spaceSlug,
|
|
177
153
|
schemaVersion,
|
|
178
|
-
|
|
154
|
+
...(0, exports.parseDocumentContent)(schemaVersion, {
|
|
155
|
+
markdown: raw.markdown,
|
|
156
|
+
charts: raw.charts ?? {},
|
|
157
|
+
}),
|
|
179
158
|
};
|
|
180
159
|
};
|
|
181
160
|
exports.parseDocumentAsCode = parseDocumentAsCode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../../src/utils/document.ts"],"names":[],"mappings":";;;;AAAA,sDAAiD;AACjD,+BAA0C;AAC1C,4GAAuE;
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../../../src/utils/document.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import type { DocumentChartContent, DocumentContent } from '../types/document';
|
|
2
|
+
/**
|
|
3
|
+
* Document markdown places charts and other references as block tags: an
|
|
4
|
+
* HTML-like tag alone on an unindented line, outside code fences, e.g.
|
|
5
|
+
* `<document-chart id="c1">`.
|
|
6
|
+
*/
|
|
7
|
+
export type DocumentTag = {
|
|
8
|
+
name: string;
|
|
9
|
+
attributes: Record<string, string>;
|
|
10
|
+
};
|
|
11
|
+
export type DocumentBlock = {
|
|
12
|
+
type: 'markdown';
|
|
13
|
+
markdown: string;
|
|
14
|
+
} | {
|
|
15
|
+
type: 'tag';
|
|
16
|
+
tag: DocumentTag;
|
|
17
|
+
};
|
|
18
|
+
export declare const DOCUMENT_CHART_TAG = "document-chart";
|
|
19
|
+
export declare const parseDocumentBlocks: (markdown: string, tagNames: readonly string[]) => DocumentBlock[];
|
|
20
|
+
export declare const formatDocumentTag: ({ name, attributes }: DocumentTag) => string;
|
|
21
|
+
export declare const joinDocumentBlocks: (blocks: DocumentBlock[]) => string;
|
|
22
|
+
export declare const getDocumentChartTag: (id: string) => string;
|
|
23
|
+
/** The number of a stored chart id (`c3` → 3), or undefined for a temporary key. */
|
|
24
|
+
export declare const getDocumentChartNumber: (id: string) => number | undefined;
|
|
25
|
+
export type DocumentChartBlock = {
|
|
26
|
+
type: 'markdown';
|
|
27
|
+
markdown: string;
|
|
28
|
+
} | {
|
|
29
|
+
type: 'chart';
|
|
30
|
+
id: string;
|
|
31
|
+
chart: DocumentChartContent;
|
|
32
|
+
};
|
|
33
|
+
/**
|
|
34
|
+
* The Document in reading order. Chart tags must reference an entry in
|
|
35
|
+
* `charts`, once each; other tags stay markdown.
|
|
36
|
+
*/
|
|
37
|
+
export declare const getDocumentChartBlocks: (content: DocumentContent) => DocumentChartBlock[];
|
|
38
|
+
/** Canonical content: chart tags carry only their id, unplaced charts are dropped. */
|
|
39
|
+
export declare const fromDocumentChartBlocks: (blocks: DocumentChartBlock[]) => DocumentContent;
|
|
40
|
+
export declare const mapDocumentCharts: (content: DocumentContent, map: (chart: DocumentChartContent, id: string) => DocumentChartContent) => DocumentContent;
|
|
41
|
+
/**
|
|
42
|
+
* Replace temporary chart keys with stored ids. Keys already shaped like
|
|
43
|
+
* `c<n>` are kept; the others get the next free numbers in reading order, so
|
|
44
|
+
* an id is never handed out twice for one Document.
|
|
45
|
+
*/
|
|
46
|
+
export declare const assignDocumentChartIds: (content: DocumentContent, nextChartNumber: number) => {
|
|
47
|
+
content: DocumentContent;
|
|
48
|
+
nextChartNumber: number;
|
|
49
|
+
};
|
|
50
|
+
export declare const getDocumentChartList: (content: DocumentContent) => Array<{
|
|
51
|
+
id: string;
|
|
52
|
+
chart: DocumentChartContent;
|
|
53
|
+
}>;
|
|
54
|
+
/**
|
|
55
|
+
* The Document with each chart tag expanded into a short description (id,
|
|
56
|
+
* title, type, explore), for readers that should not receive full charts.
|
|
57
|
+
*/
|
|
58
|
+
export declare const getDocumentSummaryMarkdown: (content: DocumentContent) => string;
|
|
59
|
+
/**
|
|
60
|
+
* Give a temporary chart key the stored id of an identical, otherwise unplaced
|
|
61
|
+
* chart in the previous version, so re-sending an unchanged chart under a
|
|
62
|
+
* temporary key (e.g. re-uploading a file) does not copy it.
|
|
63
|
+
*/
|
|
64
|
+
export declare const matchDocumentChartKeys: (content: DocumentContent, previous: DocumentContent) => DocumentContent;
|
|
65
|
+
//# sourceMappingURL=documentMarkdown.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"documentMarkdown.d.ts","sourceRoot":"","sources":["../../../src/utils/documentMarkdown.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAI/E;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,aAAa,GACnB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,GAAG,EAAE,WAAW,CAAA;CAAE,CAAC;AAExC,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AAiCnD,eAAO,MAAM,mBAAmB,aAClB,MAAM,YACN,SAAS,MAAM,EAAE,KAC5B,aAAa,EAyCf,CAAC;AAEF,eAAO,MAAM,iBAAiB,yBAA0B,WAAW,KAAG,MAGlD,CAAC;AAErB,eAAO,MAAM,kBAAkB,WAAY,aAAa,EAAE,KAAG,MAOxC,CAAC;AAEtB,eAAO,MAAM,mBAAmB,OAAQ,MAAM,KAAG,MACsB,CAAC;AAExE,oFAAoF;AACpF,eAAO,MAAM,sBAAsB,OAAQ,MAAM,KAAG,MAAM,GAAG,SAG5D,CAAC;AAEF,MAAM,MAAM,kBAAkB,GACxB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,oBAAoB,CAAA;CAAE,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,sBAAsB,YACtB,eAAe,KACzB,kBAAkB,EA4BpB,CAAC;AAEF,sFAAsF;AACtF,eAAO,MAAM,uBAAuB,WACxB,kBAAkB,EAAE,KAC7B,eAmBD,CAAC;AAEH,eAAO,MAAM,iBAAiB,YACjB,eAAe,OACnB,CAAC,KAAK,EAAE,oBAAoB,EAAE,EAAE,EAAE,MAAM,KAAK,oBAAoB,KACvE,eAQD,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,YACtB,eAAe,mBACP,MAAM,KACxB;IAAE,OAAO,EAAE,eAAe,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAyBrD,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACpB,eAAe,KACzB,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,oBAAoB,CAAA;CAAE,CAG/C,CAAC;AASN;;;GAGG;AACH,eAAO,MAAM,0BAA0B,YAAa,eAAe,KAAG,MAmBjE,CAAC;AAEN;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,YACtB,eAAe,YACd,eAAe,KAC1B,eA0BF,CAAC"}
|
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.matchDocumentChartKeys = exports.getDocumentSummaryMarkdown = exports.getDocumentChartList = exports.assignDocumentChartIds = exports.mapDocumentCharts = exports.fromDocumentChartBlocks = exports.getDocumentChartBlocks = exports.getDocumentChartNumber = exports.getDocumentChartTag = exports.joinDocumentBlocks = exports.formatDocumentTag = exports.parseDocumentBlocks = exports.DOCUMENT_CHART_TAG = void 0;
|
|
4
|
+
const lodash_1 = require("lodash");
|
|
5
|
+
const errors_1 = require("../types/errors");
|
|
6
|
+
const savedCharts_1 = require("../types/savedCharts");
|
|
7
|
+
exports.DOCUMENT_CHART_TAG = 'document-chart';
|
|
8
|
+
const TAG_LINE_RE = /^<([a-z][a-z-]*)((?:\s+[a-z][a-z-]*="[^"]*")*)\s*\/?>(?:<\/\1>)?$/;
|
|
9
|
+
const ATTRIBUTE_RE = /([a-z][a-z-]*)="([^"]*)"/g;
|
|
10
|
+
const FENCE_RE = /^(`{3,}|~{3,})/;
|
|
11
|
+
const DOCUMENT_CHART_ID_RE = /^c([1-9]\d*)$/;
|
|
12
|
+
const decodeAttribute = (value) => value
|
|
13
|
+
.replaceAll('"', '"')
|
|
14
|
+
.replaceAll('<', '<')
|
|
15
|
+
.replaceAll('>', '>')
|
|
16
|
+
.replaceAll('&', '&');
|
|
17
|
+
const encodeAttribute = (value) => value
|
|
18
|
+
.replaceAll('&', '&')
|
|
19
|
+
.replaceAll('"', '"')
|
|
20
|
+
.replaceAll('<', '<')
|
|
21
|
+
.replaceAll('>', '>');
|
|
22
|
+
/** Drop surrounding blank lines, keeping the first line's indentation. */
|
|
23
|
+
const trimBlankLines = (lines) => {
|
|
24
|
+
const start = lines.findIndex((line) => line.trim() !== '');
|
|
25
|
+
if (start === -1)
|
|
26
|
+
return '';
|
|
27
|
+
const end = lines.findLastIndex((line) => line.trim() !== '');
|
|
28
|
+
return lines
|
|
29
|
+
.slice(start, end + 1)
|
|
30
|
+
.join('\n')
|
|
31
|
+
.trimEnd();
|
|
32
|
+
};
|
|
33
|
+
const parseDocumentBlocks = (markdown, tagNames) => {
|
|
34
|
+
const blocks = [];
|
|
35
|
+
let lines = [];
|
|
36
|
+
let fence = null;
|
|
37
|
+
const flush = () => {
|
|
38
|
+
const text = trimBlankLines(lines);
|
|
39
|
+
if (text)
|
|
40
|
+
blocks.push({ type: 'markdown', markdown: text });
|
|
41
|
+
lines = [];
|
|
42
|
+
};
|
|
43
|
+
markdown.split(/\r?\n/).forEach((line) => {
|
|
44
|
+
const fenceMatch = FENCE_RE.exec(line.trim());
|
|
45
|
+
if (fence !== null) {
|
|
46
|
+
if (fenceMatch && fenceMatch[1].startsWith(fence))
|
|
47
|
+
fence = null;
|
|
48
|
+
lines.push(line);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
if (fenceMatch) {
|
|
52
|
+
[, fence] = fenceMatch;
|
|
53
|
+
lines.push(line);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
const tagMatch = TAG_LINE_RE.exec(line.trimEnd());
|
|
57
|
+
if (tagMatch && tagNames.includes(tagMatch[1])) {
|
|
58
|
+
flush();
|
|
59
|
+
blocks.push({
|
|
60
|
+
type: 'tag',
|
|
61
|
+
tag: {
|
|
62
|
+
name: tagMatch[1],
|
|
63
|
+
attributes: Object.fromEntries([...tagMatch[2].matchAll(ATTRIBUTE_RE)].map(([, key, value]) => [key, decodeAttribute(value)])),
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
lines.push(line);
|
|
69
|
+
});
|
|
70
|
+
flush();
|
|
71
|
+
return blocks;
|
|
72
|
+
};
|
|
73
|
+
exports.parseDocumentBlocks = parseDocumentBlocks;
|
|
74
|
+
const formatDocumentTag = ({ name, attributes }) => `<${name}${Object.entries(attributes)
|
|
75
|
+
.map(([key, value]) => ` ${key}="${encodeAttribute(value)}"`)
|
|
76
|
+
.join('')}>`;
|
|
77
|
+
exports.formatDocumentTag = formatDocumentTag;
|
|
78
|
+
const joinDocumentBlocks = (blocks) => blocks
|
|
79
|
+
.map((block) => block.type === 'markdown'
|
|
80
|
+
? block.markdown
|
|
81
|
+
: (0, exports.formatDocumentTag)(block.tag))
|
|
82
|
+
.join('\n\n');
|
|
83
|
+
exports.joinDocumentBlocks = joinDocumentBlocks;
|
|
84
|
+
const getDocumentChartTag = (id) => (0, exports.formatDocumentTag)({ name: exports.DOCUMENT_CHART_TAG, attributes: { id } });
|
|
85
|
+
exports.getDocumentChartTag = getDocumentChartTag;
|
|
86
|
+
/** The number of a stored chart id (`c3` → 3), or undefined for a temporary key. */
|
|
87
|
+
const getDocumentChartNumber = (id) => {
|
|
88
|
+
const match = DOCUMENT_CHART_ID_RE.exec(id);
|
|
89
|
+
return match ? Number(match[1]) : undefined;
|
|
90
|
+
};
|
|
91
|
+
exports.getDocumentChartNumber = getDocumentChartNumber;
|
|
92
|
+
/**
|
|
93
|
+
* The Document in reading order. Chart tags must reference an entry in
|
|
94
|
+
* `charts`, once each; other tags stay markdown.
|
|
95
|
+
*/
|
|
96
|
+
const getDocumentChartBlocks = (content) => {
|
|
97
|
+
const seen = new Set();
|
|
98
|
+
return (0, exports.parseDocumentBlocks)(content.markdown, [exports.DOCUMENT_CHART_TAG]).map((block) => {
|
|
99
|
+
if (block.type === 'markdown')
|
|
100
|
+
return block;
|
|
101
|
+
const { id } = block.tag.attributes;
|
|
102
|
+
if (!id) {
|
|
103
|
+
throw new errors_1.ParameterError(`Every <${exports.DOCUMENT_CHART_TAG}> tag needs an id`);
|
|
104
|
+
}
|
|
105
|
+
if (seen.has(id)) {
|
|
106
|
+
throw new errors_1.ParameterError(`Chart "${id}" is placed more than once`);
|
|
107
|
+
}
|
|
108
|
+
seen.add(id);
|
|
109
|
+
const chart = Object.hasOwn(content.charts, id)
|
|
110
|
+
? content.charts[id]
|
|
111
|
+
: undefined;
|
|
112
|
+
if (chart === undefined) {
|
|
113
|
+
throw new errors_1.ParameterError(`Chart "${id}" is placed in the markdown but missing from charts`);
|
|
114
|
+
}
|
|
115
|
+
return { type: 'chart', id, chart };
|
|
116
|
+
});
|
|
117
|
+
};
|
|
118
|
+
exports.getDocumentChartBlocks = getDocumentChartBlocks;
|
|
119
|
+
/** Canonical content: chart tags carry only their id, unplaced charts are dropped. */
|
|
120
|
+
const fromDocumentChartBlocks = (blocks) => ({
|
|
121
|
+
markdown: (0, exports.joinDocumentBlocks)(blocks.map((block) => block.type === 'markdown'
|
|
122
|
+
? block
|
|
123
|
+
: {
|
|
124
|
+
type: 'tag',
|
|
125
|
+
tag: {
|
|
126
|
+
name: exports.DOCUMENT_CHART_TAG,
|
|
127
|
+
attributes: { id: block.id },
|
|
128
|
+
},
|
|
129
|
+
})),
|
|
130
|
+
charts: Object.fromEntries(blocks.flatMap((block) => block.type === 'chart' ? [[block.id, block.chart]] : [])),
|
|
131
|
+
});
|
|
132
|
+
exports.fromDocumentChartBlocks = fromDocumentChartBlocks;
|
|
133
|
+
const mapDocumentCharts = (content, map) => ({
|
|
134
|
+
...content,
|
|
135
|
+
charts: Object.fromEntries(Object.entries(content.charts).map(([id, chart]) => [
|
|
136
|
+
id,
|
|
137
|
+
map(chart, id),
|
|
138
|
+
])),
|
|
139
|
+
});
|
|
140
|
+
exports.mapDocumentCharts = mapDocumentCharts;
|
|
141
|
+
/**
|
|
142
|
+
* Replace temporary chart keys with stored ids. Keys already shaped like
|
|
143
|
+
* `c<n>` are kept; the others get the next free numbers in reading order, so
|
|
144
|
+
* an id is never handed out twice for one Document.
|
|
145
|
+
*/
|
|
146
|
+
const assignDocumentChartIds = (content, nextChartNumber) => {
|
|
147
|
+
const blocks = (0, exports.getDocumentChartBlocks)(content);
|
|
148
|
+
let next = Math.max(nextChartNumber, ...blocks.map((block) => block.type === 'chart'
|
|
149
|
+
? ((0, exports.getDocumentChartNumber)(block.id) ?? 0) + 1
|
|
150
|
+
: 1));
|
|
151
|
+
const assigned = blocks.map((block) => {
|
|
152
|
+
if (block.type === 'markdown' ||
|
|
153
|
+
(0, exports.getDocumentChartNumber)(block.id) !== undefined) {
|
|
154
|
+
return block;
|
|
155
|
+
}
|
|
156
|
+
const id = `c${next}`;
|
|
157
|
+
next += 1;
|
|
158
|
+
return { ...block, id };
|
|
159
|
+
});
|
|
160
|
+
return {
|
|
161
|
+
content: (0, exports.fromDocumentChartBlocks)(assigned),
|
|
162
|
+
nextChartNumber: next,
|
|
163
|
+
};
|
|
164
|
+
};
|
|
165
|
+
exports.assignDocumentChartIds = assignDocumentChartIds;
|
|
166
|
+
const getDocumentChartList = (content) => (0, exports.getDocumentChartBlocks)(content).flatMap((block) => block.type === 'chart' ? [{ id: block.id, chart: block.chart }] : []);
|
|
167
|
+
exports.getDocumentChartList = getDocumentChartList;
|
|
168
|
+
const getChartTypeLabel = ({ chart }) => {
|
|
169
|
+
if (chart.chartConfig.type !== savedCharts_1.ChartType.CARTESIAN) {
|
|
170
|
+
return chart.chartConfig.type;
|
|
171
|
+
}
|
|
172
|
+
return chart.chartConfig.config?.eChartsConfig.series?.[0]?.type ?? 'bar';
|
|
173
|
+
};
|
|
174
|
+
/**
|
|
175
|
+
* The Document with each chart tag expanded into a short description (id,
|
|
176
|
+
* title, type, explore), for readers that should not receive full charts.
|
|
177
|
+
*/
|
|
178
|
+
const getDocumentSummaryMarkdown = (content) => (0, exports.joinDocumentBlocks)((0, exports.getDocumentChartBlocks)(content).map((block) => {
|
|
179
|
+
if (block.type === 'markdown')
|
|
180
|
+
return block;
|
|
181
|
+
const { chart, source } = block.chart;
|
|
182
|
+
return {
|
|
183
|
+
type: 'tag',
|
|
184
|
+
tag: {
|
|
185
|
+
name: exports.DOCUMENT_CHART_TAG,
|
|
186
|
+
attributes: {
|
|
187
|
+
id: block.id,
|
|
188
|
+
title: chart.name,
|
|
189
|
+
type: getChartTypeLabel(block.chart),
|
|
190
|
+
explore: chart.tableName,
|
|
191
|
+
...(source === 'merge' ? { source } : {}),
|
|
192
|
+
},
|
|
193
|
+
},
|
|
194
|
+
};
|
|
195
|
+
}));
|
|
196
|
+
exports.getDocumentSummaryMarkdown = getDocumentSummaryMarkdown;
|
|
197
|
+
/**
|
|
198
|
+
* Give a temporary chart key the stored id of an identical, otherwise unplaced
|
|
199
|
+
* chart in the previous version, so re-sending an unchanged chart under a
|
|
200
|
+
* temporary key (e.g. re-uploading a file) does not copy it.
|
|
201
|
+
*/
|
|
202
|
+
const matchDocumentChartKeys = (content, previous) => {
|
|
203
|
+
const blocks = (0, exports.getDocumentChartBlocks)(content);
|
|
204
|
+
const used = new Set(blocks.flatMap((block) => block.type === 'chart' &&
|
|
205
|
+
(0, exports.getDocumentChartNumber)(block.id) !== undefined
|
|
206
|
+
? [block.id]
|
|
207
|
+
: []));
|
|
208
|
+
return (0, exports.fromDocumentChartBlocks)(blocks.map((block) => {
|
|
209
|
+
if (block.type === 'markdown' ||
|
|
210
|
+
(0, exports.getDocumentChartNumber)(block.id) !== undefined) {
|
|
211
|
+
return block;
|
|
212
|
+
}
|
|
213
|
+
const match = Object.entries(previous.charts).find(([id, chart]) => !used.has(id) && (0, lodash_1.isEqual)(chart, block.chart));
|
|
214
|
+
if (!match)
|
|
215
|
+
return block;
|
|
216
|
+
used.add(match[0]);
|
|
217
|
+
return { ...block, id: match[0] };
|
|
218
|
+
}));
|
|
219
|
+
};
|
|
220
|
+
exports.matchDocumentChartKeys = matchDocumentChartKeys;
|
|
221
|
+
//# sourceMappingURL=documentMarkdown.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"documentMarkdown.js","sourceRoot":"","sources":["../../../src/utils/documentMarkdown.ts"],"names":[],"mappings":"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"}
|