@duckcodeailabs/dql-notebook 1.6.33 → 1.7.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/document.d.ts +41 -2
- package/dist/document.d.ts.map +1 -1
- package/dist/document.js +41 -14
- package/dist/document.js.map +1 -1
- package/dist/execute.d.ts +2 -0
- package/dist/execute.d.ts.map +1 -1
- package/dist/execute.js +28 -7
- package/dist/execute.js.map +1 -1
- package/dist/semantic-refs.d.ts +9 -1
- package/dist/semantic-refs.d.ts.map +1 -1
- package/dist/semantic-refs.js +81 -1
- package/dist/semantic-refs.js.map +1 -1
- package/package.json +3 -3
package/dist/document.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
1
|
+
import { type ProductDomainContext } from "@duckcodeailabs/dql-core";
|
|
2
|
+
export type NotebookCellType = "markdown" | "sql" | "dql" | "param" | "chart" | "pivot" | "single_value" | "filter" | "table" | "map" | "writeback" | "python" | "chat";
|
|
3
|
+
export interface NotebookMetadata extends ProductDomainContext {
|
|
3
4
|
title: string;
|
|
4
5
|
description?: string;
|
|
5
6
|
createdWith: 'dql';
|
|
@@ -20,8 +21,46 @@ export interface NotebookCell {
|
|
|
20
21
|
title?: string;
|
|
21
22
|
source: string;
|
|
22
23
|
config?: NotebookChartConfig;
|
|
24
|
+
executionTarget?: {
|
|
25
|
+
target: "connection" | "local";
|
|
26
|
+
connectionName?: string;
|
|
27
|
+
};
|
|
28
|
+
datasetRefs?: Array<{
|
|
29
|
+
id: string;
|
|
30
|
+
alias?: string;
|
|
31
|
+
role?: "source" | "staged" | "output";
|
|
32
|
+
fingerprint?: string;
|
|
33
|
+
}>;
|
|
34
|
+
dependencies?: Array<{
|
|
35
|
+
cellId: string;
|
|
36
|
+
output?: string;
|
|
37
|
+
}>;
|
|
38
|
+
annotations?: Array<{
|
|
39
|
+
id: string;
|
|
40
|
+
body: string;
|
|
41
|
+
createdAt: string;
|
|
42
|
+
updatedAt?: string;
|
|
43
|
+
author?: string;
|
|
44
|
+
}>;
|
|
45
|
+
mixedSourcePlan?: {
|
|
46
|
+
datasetId?: string;
|
|
47
|
+
datasetName?: string;
|
|
48
|
+
localDataset: string;
|
|
49
|
+
localAlias: string;
|
|
50
|
+
localKey: string;
|
|
51
|
+
warehouseKey: string;
|
|
52
|
+
warehouseExpression: string;
|
|
53
|
+
warehouseSql: string;
|
|
54
|
+
warehouseRelations?: string[];
|
|
55
|
+
};
|
|
56
|
+
dqlArtifact?: Record<string, unknown>;
|
|
57
|
+
chatConfig?: Record<string, unknown>;
|
|
58
|
+
kernel?: Record<string, unknown>;
|
|
59
|
+
/** Future cell metadata is intentionally retained by the document reader. */
|
|
60
|
+
[key: string]: unknown;
|
|
23
61
|
}
|
|
24
62
|
export interface NotebookDocument {
|
|
63
|
+
dqlnbVersion: 2;
|
|
25
64
|
version: 1;
|
|
26
65
|
metadata: NotebookMetadata;
|
|
27
66
|
cells: NotebookCell[];
|
package/dist/document.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AACA,OAAO,EAAiC,KAAK,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEpG,MAAM,MAAM,gBAAgB,GACxB,UAAU,GACV,KAAK,GACL,KAAK,GACL,OAAO,GACP,OAAO,GACP,OAAO,GACP,cAAc,GACd,QAAQ,GACR,OAAO,GACP,KAAK,GACL,WAAW,GACX,QAAQ,GACR,MAAM,CAAC;AAEX,MAAM,WAAW,gBAAiB,SAAQ,oBAAoB;IAC5D,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,KAAK,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,gBAAgB,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,eAAe,CAAC,EAAE;QAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9E,WAAW,CAAC,EAAE,KAAK,CAAC;QAClB,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;QACtC,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC,CAAC;IACH,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1D,WAAW,CAAC,EAAE,KAAK,CAAC;QAClB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;IACH,eAAe,CAAC,EAAE;QAChB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,YAAY,EAAE,MAAM,CAAC;QACrB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;KAC/B,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,6EAA6E;IAC7E,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,CAAC,CAAC;IAChB,OAAO,EAAE,CAAC,CAAC;IACX,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,YAAY,EAAE,EACrB,QAAQ,GAAE,OAAO,CAAC,gBAAgB,CAAM,GACvC,gBAAgB,CAYlB;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAmBpE;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,CAkCjE;AA4BD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAwE/G"}
|
package/dist/document.js
CHANGED
|
@@ -1,37 +1,64 @@
|
|
|
1
|
+
import { canonicalizeNotebook } from "@duckcodeailabs/dql-core/format";
|
|
2
|
+
import { normalizeProductDomainContext } from "@duckcodeailabs/dql-core";
|
|
1
3
|
export function createNotebookDocument(title, cells, metadata = {}) {
|
|
2
4
|
return {
|
|
5
|
+
dqlnbVersion: 2,
|
|
3
6
|
version: 1,
|
|
4
7
|
metadata: {
|
|
5
8
|
title,
|
|
6
9
|
createdWith: 'dql',
|
|
7
10
|
...metadata,
|
|
11
|
+
...normalizeProductDomainContext(metadata),
|
|
8
12
|
},
|
|
9
13
|
cells,
|
|
10
14
|
};
|
|
11
15
|
}
|
|
12
16
|
export function serializeNotebook(document) {
|
|
13
|
-
|
|
17
|
+
const { title, ...metadata } = document.metadata;
|
|
18
|
+
return canonicalizeNotebook(JSON.stringify({
|
|
19
|
+
dqlnbVersion: 2,
|
|
20
|
+
version: 1,
|
|
21
|
+
title,
|
|
22
|
+
metadata,
|
|
23
|
+
cells: document.cells.map((cell) => {
|
|
24
|
+
const { source, title: cellTitle, config, ...rest } = cell;
|
|
25
|
+
return {
|
|
26
|
+
...rest,
|
|
27
|
+
...(cellTitle ? { name: cellTitle } : {}),
|
|
28
|
+
content: source,
|
|
29
|
+
...(config ? { chartConfig: config } : {}),
|
|
30
|
+
};
|
|
31
|
+
}),
|
|
32
|
+
}));
|
|
14
33
|
}
|
|
15
34
|
export function deserializeNotebook(raw) {
|
|
16
35
|
const parsed = JSON.parse(raw);
|
|
17
|
-
|
|
18
|
-
|
|
36
|
+
const parsedRecord = parsed;
|
|
37
|
+
const documentTitle = parsed.metadata?.title ?? parsedRecord.title;
|
|
38
|
+
if (parsed.version !== 1 || !documentTitle || !Array.isArray(parsed.cells)) {
|
|
39
|
+
throw new Error("Invalid .dqlnb document.");
|
|
19
40
|
}
|
|
20
41
|
return {
|
|
42
|
+
dqlnbVersion: 2,
|
|
21
43
|
version: 1,
|
|
22
44
|
metadata: {
|
|
23
|
-
title:
|
|
24
|
-
description: parsed.metadata
|
|
25
|
-
createdWith:
|
|
26
|
-
template: parsed.metadata
|
|
45
|
+
title: documentTitle,
|
|
46
|
+
description: parsed.metadata?.description,
|
|
47
|
+
createdWith: "dql",
|
|
48
|
+
template: parsed.metadata?.template,
|
|
49
|
+
...normalizeProductDomainContext(parsed.metadata ?? {}, parsed.metadata?.ownerDomain),
|
|
27
50
|
},
|
|
28
|
-
cells: parsed.cells.map((cell, index) =>
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
51
|
+
cells: parsed.cells.map((cell, index) => {
|
|
52
|
+
const raw = cell;
|
|
53
|
+
return {
|
|
54
|
+
...cell,
|
|
55
|
+
id: cell.id ?? `cell-${index + 1}`,
|
|
56
|
+
type: cell.type ?? "markdown",
|
|
57
|
+
title: cell.title ?? raw.name,
|
|
58
|
+
source: cell.source ?? raw.content ?? "",
|
|
59
|
+
config: cell.config ?? raw.chartConfig,
|
|
60
|
+
};
|
|
61
|
+
}),
|
|
35
62
|
};
|
|
36
63
|
}
|
|
37
64
|
function listTablesSQL(driver) {
|
package/dist/document.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"document.js","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"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"}
|
package/dist/execute.d.ts
CHANGED
|
@@ -19,6 +19,8 @@ export interface BuildExecutionPlanOptions {
|
|
|
19
19
|
driver?: string;
|
|
20
20
|
/** Maps semantic table names to actual database table names, e.g. order_items -> dev.order_items. */
|
|
21
21
|
tableMapping?: Record<string, string>;
|
|
22
|
+
/** Resolved typed values from the shared block invocation contract. */
|
|
23
|
+
parameters?: Record<string, unknown>;
|
|
22
24
|
}
|
|
23
25
|
export declare function buildExecutionPlan(cell: NotebookCell, options?: BuildExecutionPlanOptions): NotebookExecutionPlan | null;
|
|
24
26
|
//# sourceMappingURL=execute.d.ts.map
|
package/dist/execute.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGvE,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,WAAW,CAAC,EAAE,mBAAmB,CAAC;IAClC,KAAK,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,4EAA4E;IAC5E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qGAAqG;IACrG,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,uEAAuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACtC;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,YAAY,EAClB,OAAO,CAAC,EAAE,yBAAyB,GAClC,qBAAqB,GAAG,IAAI,CAwE9B"}
|
package/dist/execute.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { NodeKind, parse, } from '@duckcodeailabs/dql-core';
|
|
1
|
+
import { NodeKind, blockSemanticRuntimeBindings, parse, } from '@duckcodeailabs/dql-core';
|
|
2
2
|
import { resolveSemanticRefs, hasSemanticRefs } from './semantic-refs.js';
|
|
3
3
|
export function buildExecutionPlan(cell, options) {
|
|
4
4
|
if (cell.type === 'markdown' || cell.type === 'chart') {
|
|
@@ -8,7 +8,9 @@ export function buildExecutionPlan(cell, options) {
|
|
|
8
8
|
// Resolve @metric(name) and @dim(name) references in SQL cells
|
|
9
9
|
let resolvedSql = cell.source;
|
|
10
10
|
if (options?.semanticLayer && hasSemanticRefs(cell.source)) {
|
|
11
|
-
const resolution = resolveSemanticRefs(cell.source, options.semanticLayer
|
|
11
|
+
const resolution = resolveSemanticRefs(cell.source, options.semanticLayer, {
|
|
12
|
+
tableMapping: options.tableMapping,
|
|
13
|
+
});
|
|
12
14
|
if (resolution.unresolvedRefs.length > 0) {
|
|
13
15
|
throw new Error(`Unresolved semantic references in SQL cell: ${resolution.unresolvedRefs.join(', ')}. ` +
|
|
14
16
|
'Check that these metrics/dimensions exist in your semantic layer.');
|
|
@@ -31,7 +33,7 @@ export function buildExecutionPlan(cell, options) {
|
|
|
31
33
|
}
|
|
32
34
|
// Semantic blocks: compose SQL from the semantic layer
|
|
33
35
|
if (block.blockType === 'semantic') {
|
|
34
|
-
return buildSemanticPlan(block, options?.semanticLayer, options?.driver, options?.tableMapping);
|
|
36
|
+
return buildSemanticPlan(block, options?.semanticLayer, options?.driver, options?.tableMapping, options?.parameters);
|
|
35
37
|
}
|
|
36
38
|
if (block.blockType !== 'custom') {
|
|
37
39
|
throw new Error(`Unsupported block type "${block.blockType}". Only "custom" and "semantic" blocks can run in the notebook.`);
|
|
@@ -41,7 +43,9 @@ export function buildExecutionPlan(cell, options) {
|
|
|
41
43
|
}
|
|
42
44
|
const processed = applyRLSDecorators(block.decorators, processSQL(block.query.rawSQL, block.query.interpolations));
|
|
43
45
|
const chartConfig = block.visualization ? lowerChartConfig(block.visualization.properties) : undefined;
|
|
44
|
-
const variables = Object.fromEntries((block.params?.params ?? [])
|
|
46
|
+
const variables = Object.fromEntries((block.params?.params ?? [])
|
|
47
|
+
.filter((param) => param.initializer)
|
|
48
|
+
.map((param) => [param.name, evaluateExpression(param.initializer)]));
|
|
45
49
|
return {
|
|
46
50
|
title: block.name,
|
|
47
51
|
sql: processed.sql,
|
|
@@ -103,7 +107,7 @@ function processSQL(rawSQL, interpolations) {
|
|
|
103
107
|
}
|
|
104
108
|
return { sql, params };
|
|
105
109
|
}
|
|
106
|
-
function buildSemanticPlan(block, semanticLayer, driver, tableMapping) {
|
|
110
|
+
function buildSemanticPlan(block, semanticLayer, driver, tableMapping, parameters) {
|
|
107
111
|
if (!semanticLayer) {
|
|
108
112
|
throw new Error('Semantic block requires a semantic-layer/ configuration. ' +
|
|
109
113
|
'Add metric and dimension YAML files to your project\'s semantic-layer/ directory.');
|
|
@@ -122,6 +126,8 @@ function buildSemanticPlan(block, semanticLayer, driver, tableMapping) {
|
|
|
122
126
|
}
|
|
123
127
|
// Also extract dimensions/metrics from block params if they reference names
|
|
124
128
|
for (const param of block.params?.params ?? []) {
|
|
129
|
+
if (!param.initializer)
|
|
130
|
+
continue;
|
|
125
131
|
const val = evaluateExpression(param.initializer);
|
|
126
132
|
if (param.name === 'dimensions' && Array.isArray(val)) {
|
|
127
133
|
dimensions.push(...val.map(String));
|
|
@@ -134,13 +140,28 @@ function buildSemanticPlan(block, semanticLayer, driver, tableMapping) {
|
|
|
134
140
|
throw new Error(`Semantic block "${block.name}" has no metric references. ` +
|
|
135
141
|
'Add metric = "metric_name" or metrics = ["metric1", "metric2"] to your block declaration.');
|
|
136
142
|
}
|
|
137
|
-
const
|
|
143
|
+
const runtimeBindings = blockSemanticRuntimeBindings(block, parameters);
|
|
144
|
+
const composed = semanticLayer.composeQuery({
|
|
145
|
+
metrics,
|
|
146
|
+
dimensions,
|
|
147
|
+
...(block.timeDimension && block.granularity
|
|
148
|
+
? { timeDimension: { name: block.timeDimension, granularity: block.granularity } }
|
|
149
|
+
: {}),
|
|
150
|
+
...(runtimeBindings.filters.length > 0 ? { filters: runtimeBindings.filters } : {}),
|
|
151
|
+
...((runtimeBindings.limit ?? block.limit) !== undefined
|
|
152
|
+
? { limit: runtimeBindings.limit ?? block.limit }
|
|
153
|
+
: {}),
|
|
154
|
+
driver,
|
|
155
|
+
tableMapping,
|
|
156
|
+
});
|
|
138
157
|
if (!composed) {
|
|
139
158
|
throw new Error(`Could not compose SQL for semantic block "${block.name}". ` +
|
|
140
159
|
`Check that metrics [${metrics.join(', ')}] exist in your semantic-layer/ definitions.`);
|
|
141
160
|
}
|
|
142
161
|
const chartConfig = block.visualization ? lowerChartConfig(block.visualization.properties) : undefined;
|
|
143
|
-
const variables = Object.fromEntries((block.params?.params ?? [])
|
|
162
|
+
const variables = Object.fromEntries((block.params?.params ?? [])
|
|
163
|
+
.filter((param) => param.initializer)
|
|
164
|
+
.map((param) => [param.name, evaluateExpression(param.initializer)]));
|
|
144
165
|
const processed = applyRLSDecorators(block.decorators, { sql: composed.sql, params: [] });
|
|
145
166
|
return {
|
|
146
167
|
title: block.name,
|
package/dist/execute.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../src/execute.ts"],"names":[],"mappings":"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"}
|
package/dist/semantic-refs.d.ts
CHANGED
|
@@ -10,6 +10,12 @@
|
|
|
10
10
|
* Output: SELECT segment_tier AS segment, SUM(amount) AS total_revenue FROM fct_revenue GROUP BY segment_tier
|
|
11
11
|
*/
|
|
12
12
|
import type { SemanticLayer } from '@duckcodeailabs/dql-core';
|
|
13
|
+
export interface SemanticRefResolutionOptions {
|
|
14
|
+
/** Maps semantic model names to live, schema-qualified database relations. */
|
|
15
|
+
tableMapping?: Record<string, string>;
|
|
16
|
+
/** Maximum rows returned when a standalone dimension is explored. */
|
|
17
|
+
standaloneDimensionLimit?: number;
|
|
18
|
+
}
|
|
13
19
|
export interface SemanticRefResolution {
|
|
14
20
|
/** The resolved SQL with all semantic references expanded. */
|
|
15
21
|
resolvedSql: string;
|
|
@@ -24,6 +30,8 @@ export interface SemanticRefResolution {
|
|
|
24
30
|
* Check if a SQL string contains any semantic references.
|
|
25
31
|
*/
|
|
26
32
|
export declare function hasSemanticRefs(sql: string): boolean;
|
|
33
|
+
/** Check whether the entire SQL cell is one semantic reference. */
|
|
34
|
+
export declare function hasStandaloneSemanticRef(sql: string): boolean;
|
|
27
35
|
/**
|
|
28
36
|
* Resolve all `@metric(name)` and `@dim(name)` references in a SQL string.
|
|
29
37
|
*
|
|
@@ -33,7 +41,7 @@ export declare function hasSemanticRefs(sql: string): boolean;
|
|
|
33
41
|
* If a reference can't be found in the semantic layer, it is left as-is and
|
|
34
42
|
* added to `unresolvedRefs` so the caller can report a helpful error.
|
|
35
43
|
*/
|
|
36
|
-
export declare function resolveSemanticRefs(sql: string, semanticLayer: SemanticLayer | undefined): SemanticRefResolution;
|
|
44
|
+
export declare function resolveSemanticRefs(sql: string, semanticLayer: SemanticLayer | undefined, options?: SemanticRefResolutionOptions): SemanticRefResolution;
|
|
37
45
|
/**
|
|
38
46
|
* Get a list of available semantic references for autocomplete.
|
|
39
47
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semantic-refs.d.ts","sourceRoot":"","sources":["../src/semantic-refs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"semantic-refs.d.ts","sourceRoot":"","sources":["../src/semantic-refs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAyC,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAMrG,MAAM,WAAW,4BAA4B;IAC3C,8EAA8E;IAC9E,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,qEAAqE;IACrE,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACnC;AAED,MAAM,WAAW,qBAAqB;IACpC,8DAA8D;IAC9D,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,8CAA8C;IAC9C,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,iDAAiD;IACjD,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAIpD;AAED,mEAAmE;AACnE,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,aAAa,GAAG,SAAS,EACxC,OAAO,CAAC,EAAE,4BAA4B,GACrC,qBAAqB,CA2EvB;AAgHD;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,aAAa,GAAG,SAAS,GACvC,KAAK,CAAC;IAAE,IAAI,EAAE,QAAQ,GAAG,WAAW,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CAwB3F"}
|
package/dist/semantic-refs.js
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
/** Pattern to match @metric(name) or @dim(name) references. */
|
|
13
13
|
const SEMANTIC_REF_PATTERN = /@(metric|dim|dimension)\(\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*\)/g;
|
|
14
|
+
const STANDALONE_SEMANTIC_REF_PATTERN = /^\s*@(metric|dim|dimension)\(\s*([a-zA-Z_][a-zA-Z0-9_.]*)\s*\)\s*;?\s*$/;
|
|
14
15
|
/**
|
|
15
16
|
* Check if a SQL string contains any semantic references.
|
|
16
17
|
*/
|
|
@@ -19,6 +20,10 @@ export function hasSemanticRefs(sql) {
|
|
|
19
20
|
// across calls and would return false on every second call for the same SQL.
|
|
20
21
|
return /@(metric|dim|dimension)\(\s*[a-zA-Z_][a-zA-Z0-9_.]*\s*\)/.test(sql);
|
|
21
22
|
}
|
|
23
|
+
/** Check whether the entire SQL cell is one semantic reference. */
|
|
24
|
+
export function hasStandaloneSemanticRef(sql) {
|
|
25
|
+
return STANDALONE_SEMANTIC_REF_PATTERN.test(sql);
|
|
26
|
+
}
|
|
22
27
|
/**
|
|
23
28
|
* Resolve all `@metric(name)` and `@dim(name)` references in a SQL string.
|
|
24
29
|
*
|
|
@@ -28,7 +33,7 @@ export function hasSemanticRefs(sql) {
|
|
|
28
33
|
* If a reference can't be found in the semantic layer, it is left as-is and
|
|
29
34
|
* added to `unresolvedRefs` so the caller can report a helpful error.
|
|
30
35
|
*/
|
|
31
|
-
export function resolveSemanticRefs(sql, semanticLayer) {
|
|
36
|
+
export function resolveSemanticRefs(sql, semanticLayer, options) {
|
|
32
37
|
const resolvedMetrics = [];
|
|
33
38
|
const resolvedDimensions = [];
|
|
34
39
|
const unresolvedRefs = [];
|
|
@@ -49,6 +54,16 @@ export function resolveSemanticRefs(sql, semanticLayer) {
|
|
|
49
54
|
}
|
|
50
55
|
return { resolvedSql: sql, resolvedMetrics: [], resolvedDimensions: [], unresolvedRefs: [] };
|
|
51
56
|
}
|
|
57
|
+
// The notebook library lets users drag a semantic item into the canvas to
|
|
58
|
+
// create a cell whose complete source is `@dim(...)` or `@metric(...)`.
|
|
59
|
+
// Those references are expressions inside normal SQL, but a standalone cell
|
|
60
|
+
// needs a complete query. Compile it from semantic ownership plus the live
|
|
61
|
+
// table mapping so this works for any project/schema, not a fixture-specific
|
|
62
|
+
// relation name.
|
|
63
|
+
const standalone = sql.match(STANDALONE_SEMANTIC_REF_PATTERN);
|
|
64
|
+
if (standalone) {
|
|
65
|
+
return resolveStandaloneSemanticRef(standalone[1], standalone[2], semanticLayer, options);
|
|
66
|
+
}
|
|
52
67
|
// Track which position in the SQL each ref appears to handle GROUP BY correctly
|
|
53
68
|
// (in GROUP BY, we should NOT include the alias or aggregation wrapper)
|
|
54
69
|
const resolvedSql = sql.replace(SEMANTIC_REF_PATTERN, (match, refType, name) => {
|
|
@@ -83,6 +98,71 @@ export function resolveSemanticRefs(sql, semanticLayer) {
|
|
|
83
98
|
unresolvedRefs,
|
|
84
99
|
};
|
|
85
100
|
}
|
|
101
|
+
function resolveStandaloneSemanticRef(refType, name, semanticLayer, options) {
|
|
102
|
+
if (refType === 'metric') {
|
|
103
|
+
const metric = semanticLayer.getMetric(name);
|
|
104
|
+
if (!metric)
|
|
105
|
+
return unresolvedStandalone(`metric:${name}`, `@metric(${name})`);
|
|
106
|
+
const composed = composeStandaloneMetric(metric, semanticLayer, options?.tableMapping);
|
|
107
|
+
if (!composed) {
|
|
108
|
+
return unresolvedStandalone(`metric:${name} (requires a full semantic query or MetricFlow)`, `@metric(${name})`);
|
|
109
|
+
}
|
|
110
|
+
return {
|
|
111
|
+
resolvedSql: composed,
|
|
112
|
+
resolvedMetrics: [name],
|
|
113
|
+
resolvedDimensions: [],
|
|
114
|
+
unresolvedRefs: [],
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
const dimension = semanticLayer.getDimension(name);
|
|
118
|
+
if (!dimension?.table || !dimension.sql.trim()) {
|
|
119
|
+
return unresolvedStandalone(`dimension:${name}`, `@dim(${name})`);
|
|
120
|
+
}
|
|
121
|
+
const limit = clampStandaloneDimensionLimit(options?.standaloneDimensionLimit);
|
|
122
|
+
const table = options?.tableMapping?.[dimension.table] ?? dimension.table;
|
|
123
|
+
const alias = sanitizeAlias(name);
|
|
124
|
+
const tableAlias = sanitizeAlias(dimension.table.split('.').pop() ?? dimension.table);
|
|
125
|
+
const expression = qualifyDimensionExpression(dimension, tableAlias);
|
|
126
|
+
return {
|
|
127
|
+
resolvedSql: [
|
|
128
|
+
`SELECT DISTINCT ${expression} AS ${alias}`,
|
|
129
|
+
`FROM ${table} AS ${tableAlias}`,
|
|
130
|
+
`ORDER BY ${alias}`,
|
|
131
|
+
`LIMIT ${limit}`,
|
|
132
|
+
].join('\n'),
|
|
133
|
+
resolvedMetrics: [],
|
|
134
|
+
resolvedDimensions: [name],
|
|
135
|
+
unresolvedRefs: [],
|
|
136
|
+
};
|
|
137
|
+
}
|
|
138
|
+
function composeStandaloneMetric(metric, semanticLayer, tableMapping) {
|
|
139
|
+
return semanticLayer.composeQuery({
|
|
140
|
+
metrics: [metric.name],
|
|
141
|
+
dimensions: [],
|
|
142
|
+
tableMapping,
|
|
143
|
+
})?.sql ?? null;
|
|
144
|
+
}
|
|
145
|
+
function qualifyDimensionExpression(dimension, tableAlias) {
|
|
146
|
+
if (!tableAlias)
|
|
147
|
+
return dimension.sql;
|
|
148
|
+
const prefix = `${dimension.table}.`;
|
|
149
|
+
return dimension.sql.startsWith(prefix)
|
|
150
|
+
? `${tableAlias}.${dimension.sql.slice(prefix.length)}`
|
|
151
|
+
: dimension.sql;
|
|
152
|
+
}
|
|
153
|
+
function clampStandaloneDimensionLimit(value) {
|
|
154
|
+
if (!Number.isFinite(value))
|
|
155
|
+
return 200;
|
|
156
|
+
return Math.max(1, Math.min(1000, Math.trunc(value)));
|
|
157
|
+
}
|
|
158
|
+
function unresolvedStandalone(ref, sql) {
|
|
159
|
+
return {
|
|
160
|
+
resolvedSql: sql,
|
|
161
|
+
resolvedMetrics: [],
|
|
162
|
+
resolvedDimensions: [],
|
|
163
|
+
unresolvedRefs: [ref],
|
|
164
|
+
};
|
|
165
|
+
}
|
|
86
166
|
/**
|
|
87
167
|
* In GROUP BY, ORDER BY, WHERE, HAVING clauses, replace "expr AS alias" with just "expr".
|
|
88
168
|
* This is needed because SQL doesn't allow aliases in GROUP BY for most databases.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semantic-refs.js","sourceRoot":"","sources":["../src/semantic-refs.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,+DAA+D;AAC/D,MAAM,oBAAoB,GAAG,6DAA6D,CAAC;
|
|
1
|
+
{"version":3,"file":"semantic-refs.js","sourceRoot":"","sources":["../src/semantic-refs.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@duckcodeailabs/dql-notebook",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"description": "Notebook document model and execution helpers for DQL",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"access": "public"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@duckcodeailabs/dql-core": "^1.
|
|
28
|
-
"@duckcodeailabs/dql-connectors": "^1.
|
|
27
|
+
"@duckcodeailabs/dql-core": "^1.7.0",
|
|
28
|
+
"@duckcodeailabs/dql-connectors": "^1.7.0"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@types/node": "^22.0.0",
|